diff options
| author | 2016-03-21 16:39:59 +0000 | |
|---|---|---|
| committer | 2016-03-21 16:39:59 +0000 | |
| commit | 985125b33f27220608cbdb87d87bc24e36325156 (patch) | |
| tree | 2b25d8eaca06c7212cee86a1bfe30fa3bf7d6f38 | |
| parent | ae207dbf2cb73ef3cfff6dd5c502920dee4d4366 (diff) | |
| parent | 4b49567218c41e80c3448bbbcaa7e944f789780e (diff) | |
Merge "Let tests informa Jack of the min api version"
| -rw-r--r-- | test/551-checker-shifter-operand/build | 4 | ||||
| -rwxr-xr-x | test/970-iface-super-resolution-generated/build | 2 | ||||
| -rwxr-xr-x | 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 18e8c59e91..a78021f349 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 2d9830b970..fd1b271c1c 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 d048757a97..3d84821bf0 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 |