Fix USE_D8 in conjunction with USE_D8_BY_DEFAULT
We can no longer use DX=dx. Instead, we can just set USE_D8=false
after that USE_D8_BY_DEFAULT change.
Bug: 67569208
Test: ./art/test.py --host
Change-Id: Ic48157e6a26acc1380fc5ef40076d4e3b65c2b79
diff --git a/test/1929-exception-catch-exception/build b/test/1929-exception-catch-exception/build
index 42b99ad..10ffcc5 100644
--- a/test/1929-exception-catch-exception/build
+++ b/test/1929-exception-catch-exception/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/450-checker-types/build b/test/450-checker-types/build
index 947ec9a..3721955 100755
--- a/test/450-checker-types/build
+++ b/test/450-checker-types/build
@@ -21,6 +21,6 @@
export DESUGAR=false
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/458-checker-instruct-simplification/build b/test/458-checker-instruct-simplification/build
index 947ec9a..3721955 100755
--- a/test/458-checker-instruct-simplification/build
+++ b/test/458-checker-instruct-simplification/build
@@ -21,6 +21,6 @@
export DESUGAR=false
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/463-checker-boolean-simplifier/build b/test/463-checker-boolean-simplifier/build
index 947ec9a..3721955 100755
--- a/test/463-checker-boolean-simplifier/build
+++ b/test/463-checker-boolean-simplifier/build
@@ -21,6 +21,6 @@
export DESUGAR=false
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/476-checker-ctor-fence-redun-elim/build b/test/476-checker-ctor-fence-redun-elim/build
index 42b99ad..10ffcc5 100644
--- a/test/476-checker-ctor-fence-redun-elim/build
+++ b/test/476-checker-ctor-fence-redun-elim/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/482-checker-loop-back-edge-use/build b/test/482-checker-loop-back-edge-use/build
index 42b99ad..10ffcc5 100644
--- a/test/482-checker-loop-back-edge-use/build
+++ b/test/482-checker-loop-back-edge-use/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/484-checker-register-hints/build b/test/484-checker-register-hints/build
index 42b99ad..10ffcc5 100644
--- a/test/484-checker-register-hints/build
+++ b/test/484-checker-register-hints/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/530-checker-lse/build b/test/530-checker-lse/build
index 42b99ad..10ffcc5 100755
--- a/test/530-checker-lse/build
+++ b/test/530-checker-lse/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/549-checker-types-merge/build b/test/549-checker-types-merge/build
index 42b99ad..10ffcc5 100644
--- a/test/549-checker-types-merge/build
+++ b/test/549-checker-types-merge/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/565-checker-doublenegbitwise/build b/test/565-checker-doublenegbitwise/build
index 947ec9a..3721955 100755
--- a/test/565-checker-doublenegbitwise/build
+++ b/test/565-checker-doublenegbitwise/build
@@ -21,6 +21,6 @@
export DESUGAR=false
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/565-checker-rotate/build b/test/565-checker-rotate/build
index 42b99ad..10ffcc5 100644
--- a/test/565-checker-rotate/build
+++ b/test/565-checker-rotate/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/566-checker-signum/build b/test/566-checker-signum/build
index 42b99ad..10ffcc5 100644
--- a/test/566-checker-signum/build
+++ b/test/566-checker-signum/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/567-checker-compare/build b/test/567-checker-compare/build
index 1d269dc..10ffcc5 100644
--- a/test/567-checker-compare/build
+++ b/test/567-checker-compare/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/570-checker-osr/build b/test/570-checker-osr/build
index 42b99ad..10ffcc5 100644
--- a/test/570-checker-osr/build
+++ b/test/570-checker-osr/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/586-checker-null-array-get/build b/test/586-checker-null-array-get/build
index 947ec9a..3721955 100755
--- a/test/586-checker-null-array-get/build
+++ b/test/586-checker-null-array-get/build
@@ -21,6 +21,6 @@
export DESUGAR=false
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/593-checker-boolean-2-integral-conv/build b/test/593-checker-boolean-2-integral-conv/build
index 947ec9a..3721955 100755
--- a/test/593-checker-boolean-2-integral-conv/build
+++ b/test/593-checker-boolean-2-integral-conv/build
@@ -21,6 +21,6 @@
export DESUGAR=false
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/611-checker-simplify-if/build b/test/611-checker-simplify-if/build
index 42b99ad..10ffcc5 100644
--- a/test/611-checker-simplify-if/build
+++ b/test/611-checker-simplify-if/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/618-checker-induction/build b/test/618-checker-induction/build
index 42b99ad..10ffcc5 100644
--- a/test/618-checker-induction/build
+++ b/test/618-checker-induction/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/910-methods/build b/test/910-methods/build
index 42b99ad..10ffcc5 100644
--- a/test/910-methods/build
+++ b/test/910-methods/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/910-methods/check b/test/910-methods/check
index f9552ad..e6f7d77 100644
--- a/test/910-methods/check
+++ b/test/910-methods/check
@@ -19,7 +19,7 @@
patch -p0 expected.txt < expected_jack.diff
fi
-if [[ "$DX" == 'd8' ]]; then
+if [[ "$USE_D8" == true ]]; then
patch -p0 expected.txt < expected_d8.diff
fi
diff --git a/test/911-get-stack-trace/build b/test/911-get-stack-trace/build
index 42b99ad..10ffcc5 100644
--- a/test/911-get-stack-trace/build
+++ b/test/911-get-stack-trace/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"
diff --git a/test/913-heaps/build b/test/913-heaps/build
index 42b99ad..10ffcc5 100644
--- a/test/913-heaps/build
+++ b/test/913-heaps/build
@@ -15,6 +15,6 @@
# limitations under the License.
# See b/65168732
-export DX=$ANDROID_HOST_OUT/bin/dx
+export USE_D8=false
./default-build "$@"