Merge "Rename d8 to d8-compat-dx"
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 42d0ba5..3c8eade 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -608,7 +608,7 @@
endif
.PHONY: $$(rule_name)
-$$(rule_name): $$(dependencies) dx d8
+$$(rule_name): $$(dependencies) dx d8-compat-dx
$(hide) $$(call ART_TEST_PREREQ_FINISHED,$$@)
# Clear locally defined variables.
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 8755f04..fe4a327 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -27,7 +27,7 @@
# Add d8 dependency, if enabled.
ifeq ($(USE_D8),true)
TEST_ART_RUN_TEST_DEPENDENCIES += \
- $(HOST_OUT_EXECUTABLES)/d8
+ $(HOST_OUT_EXECUTABLES)/d8-compat-dx
endif
# Convert's a rule name to the form used in variables, e.g. no-relocate to NO_RELOCATE
diff --git a/test/etc/default-build b/test/etc/default-build
index f14424e..5c8257f 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -294,7 +294,7 @@
local dexer="${DX}"
if [ ${USE_D8} = "true" ]; then
- dexer="${ANDROID_HOST_OUT}/bin/d8"
+ dexer="${ANDROID_HOST_OUT}/bin/d8-compat-dx"
fi
# Make dex file from desugared JAR.