From 38c0da49e93309378f14babb9c9bf92691b4f76d Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Mon, 21 Mar 2016 16:26:02 +0100 Subject: [PATCH] Let tests inform Jack of the min api version This is necessarry for compiling source code with default method. Bug: 27371864 (cherry picked from commit 4b49567218c41e80c3448bbbcaa7e944f789780e) Change-Id: I78ce48ce8f5224e20e0d75f63f10033721ad06e8 --- test/551-checker-shifter-operand/build | 4 ++-- test/970-iface-super-resolution-generated/build | 2 +- test/etc/default-build | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/551-checker-shifter-operand/build b/test/551-checker-shifter-operand/build index 18e8c59e9..a78021f34 100644 --- a/test/551-checker-shifter-operand/build +++ b/test/551-checker-shifter-operand/build @@ -58,8 +58,8 @@ EXPERIMENTAL="" # Setup experimental flag mappings in a bash associative array. declare -A JACK_EXPERIMENTAL_ARGS -JACK_EXPERIMENTAL_ARGS["default-methods"]="-D jack.java.source.version=1.8" -JACK_EXPERIMENTAL_ARGS["lambdas"]="-D jack.java.source.version=1.8" +JACK_EXPERIMENTAL_ARGS["default-methods"]="-D jack.java.source.version=1.8 -D jack.android.min-api-level=24" +JACK_EXPERIMENTAL_ARGS["lambdas"]="-D jack.java.source.version=1.8 -D jack.android.min-api-level=24" while true; do if [ "x$1" = "x--dx-option" ]; then diff --git a/test/970-iface-super-resolution-generated/build b/test/970-iface-super-resolution-generated/build index 2d9830b97..fd1b271c1 100755 --- a/test/970-iface-super-resolution-generated/build +++ b/test/970-iface-super-resolution-generated/build @@ -31,7 +31,7 @@ USES_JAVA_SOURCE="false" if [[ $@ == *"--jvm"* ]]; then USES_JAVA_SOURCE="true" elif [[ "$USE_JACK" == "true" ]]; then - if $JACK -D jack.java.source.version=1.8 2>/dev/null; then + if $JACK -D jack.java.source.version=1.8 -D jack.android.min-api-level=24 2>/dev/null; then USES_JAVA_SOURCE="true" else echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 diff --git a/test/etc/default-build b/test/etc/default-build index d048757a9..3d84821bf 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -66,8 +66,8 @@ EXPERIMENTAL="" # Setup experimental flag mappings in a bash associative array. declare -A JACK_EXPERIMENTAL_ARGS -JACK_EXPERIMENTAL_ARGS["default-methods"]="-D jack.java.source.version=1.8" -JACK_EXPERIMENTAL_ARGS["lambdas"]="-D jack.java.source.version=1.8" +JACK_EXPERIMENTAL_ARGS["default-methods"]="-D jack.java.source.version=1.8 -D jack.android.min-api-level=24" +JACK_EXPERIMENTAL_ARGS["lambdas"]="-D jack.java.source.version=1.8 -D jack.android.min-api-level=24" while true; do if [ "x$1" = "x--dx-option" ]; then -- 2.11.0