commit 64a5d1ae323efa384e317e3b8f2cc413a1ac2680
author Nicolas Geoffray <ngeoffray@google.com> Fri Dec 06 11:06:52 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Dec 06 11:08:16 2019 +0000
tree 9ccd4683d427b7bc1cfcfb196cbc8414f2f2ff3b
parent b7bf843b04046f2758998c019e947611d0208217

Revert "Revert "Remove reference to d8-compat-dx""

This reverts commit 1caa1270a53fa08ab9c6934d5bdd2da79c7bf89e.

Reason for revert: The R8 change has relanded.

Change-Id: Ifa4e43410b895f0809860bb21c18142fd85500d3

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 51327b3..c9f05b5 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -745,7 +745,7 @@
   dependencies := $$(ART_TEST_$(2)_GTEST$(3)_RULES)
 
 .PHONY: $$(rule_name)
-$$(rule_name): $$(dependencies) d8 d8-compat-dx
+$$(rule_name): $$(dependencies) d8
 	$(hide) $$(call ART_TEST_PREREQ_FINISHED,$$@)
 
   # Clear locally defined variables.

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 8ac0a35..57a428f 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -21,7 +21,6 @@
 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