ART: Retire desugar and dx in run-tests
Run-tests now use d8 for desugaring and dexing.
Build scripts no longer have hand written dexer invocations.
Bug: 110150973
Bug: 73711890
Test: art/test.py --host --64 -r
Test: art/test.py --target --prebuild --optimizing -r
Change-Id: Iae2199cf756624c1f045de7777c5ee6432398bd2
diff --git a/test/run-test b/test/run-test
index b5b4285..d90eccd 100755
--- a/test/run-test
+++ b/test/run-test
@@ -41,7 +41,7 @@
fi
checker="${progdir}/../tools/checker/checker.py"
export JAVA="java"
-export JAVAC="javac -g -Xlint:-options"
+export JAVAC="javac -g -Xlint:-options -source 1.8 -target 1.8"
export RUN="${progdir}/etc/run-test-jar"
export DEX_LOCATION=/data/run-test/${test_dir}
export NEED_DEX="true"
@@ -56,10 +56,10 @@
# If dx was not set by the environment variable, assume it is in the path.
if [ -z "$DX" ]; then
- export DX="dx"
+ export DX="d8-compat-dx"
fi
-export DXMERGER="$D8"
+export DEXMERGER="$D8"
# If jasmin was not set by the environment variable, assume it is in the path.
if [ -z "$JASMIN" ]; then
@@ -675,13 +675,6 @@
shift
fi
-# For building with javac and dx always use Java 7. The dx compiler
-# only support byte codes from Java 7 or earlier (class file major
-# version 51 or lower).
-if [ "$NEED_DEX" = "true" ]; then
- export JAVAC="${JAVAC} -source 1.7 -target 1.7"
-fi
-
if [ "$usage" = "yes" ]; then
prog=`basename $prog`
(