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/Android.run-test.mk b/test/Android.run-test.mk
index ad292fd..53d4c37 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -19,13 +19,11 @@
# Dependencies for actually running a run-test.
TEST_ART_RUN_TEST_DEPENDENCIES := \
- $(HOST_OUT_EXECUTABLES)/dx \
$(HOST_OUT_EXECUTABLES)/d8 \
$(HOST_OUT_EXECUTABLES)/d8-compat-dx \
$(HOST_OUT_EXECUTABLES)/hiddenapi \
$(HOST_OUT_EXECUTABLES)/jasmin \
- $(HOST_OUT_EXECUTABLES)/smali \
- $(HOST_OUT_JAVA_LIBRARIES)/desugar.jar
+ $(HOST_OUT_EXECUTABLES)/smali
# We need dex2oat and dalvikvm on the target as well as the core images (all images as we sync
# only once).
@@ -97,7 +95,7 @@
# Host executables.
host_prereq_rules := $(ART_TEST_HOST_RUN_TEST_DEPENDENCIES)
-# Required for dx, jasmin, smali.
+# Required for jasmin and smali.
host_prereq_rules += $(TEST_ART_RUN_TEST_DEPENDENCIES)
# Sync test files to the target, depends upon all things that must be pushed