diff options
| author | 2018-04-05 11:37:40 -0700 | |
|---|---|---|
| committer | 2018-04-05 11:37:40 -0700 | |
| commit | 276d29b9db2eb6e3667bc3d93f66846c5655e80b (patch) | |
| tree | f8767616449145165eeccfee2e1a960bbf26dd07 | |
| parent | 281c99864f635ef4fd005dba4ba0c750cb9a6143 (diff) | |
Move 712-varhandle-invocations to API level 28
Bug: 65168732
Test: art/test/run-test --no-relocate --64 --build-with-javac-dx --runtime-option -Xcheck:jni --never-clean --host 712-varhandle-invocations
Change-Id: Ie8cab287541dd82324cc8bb8365bd31c552d0518
| -rwxr-xr-x | test/712-varhandle-invocations/build | 3 | ||||
| -rwxr-xr-x | test/etc/default-build | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/test/712-varhandle-invocations/build b/test/712-varhandle-invocations/build index 6d4429f0ef..253765be91 100755 --- a/test/712-varhandle-invocations/build +++ b/test/712-varhandle-invocations/build @@ -35,8 +35,5 @@ python3 ./util-src/generate_java.py "${GENERATED_SRC}" ${MANUAL_TESTS} # Desugar is not happy with our Java 9 byte code, it shouldn't be necessary here anyway. export USE_DESUGAR=false -# See b/65168732 -export USE_D8=false - # Invoke default build with increased heap size for dx ./default-build "$@" --experimental var-handles --dx-vm-option -JXmx384m diff --git a/test/etc/default-build b/test/etc/default-build index dd5560213a..8bb898c7c1 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -145,7 +145,7 @@ JAVAC_EXPERIMENTAL_ARGS["agents"]="-source 1.8 -target 1.8" declare -A DX_EXPERIMENTAL_ARGS DX_EXPERIMENTAL_ARGS["method-handles"]="--min-sdk-version=26" DX_EXPERIMENTAL_ARGS["parameter-annotations"]="--min-sdk-version=25" -DX_EXPERIMENTAL_ARGS["var-handles"]="--min-sdk-version=26" +DX_EXPERIMENTAL_ARGS["var-handles"]="--min-sdk-version=28" while true; do if [ "x$1" = "x--dx-option" ]; then |