commit 9561faf10d2e23f322da03743a30843296971fd0
author Nicolas Geoffray <ngeoffray@google.com> Fri Dec 06 13:35:59 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Dec 06 16:03:40 2019 +0000
tree 6222d0135f32e9e4dc9b4f1372cd5fd0e88c19c6
parent b0a9747b363d1a368ed390fde07c6bfd6fbc78bf

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

This reverts commit 64a5d1ae323efa384e317e3b8f2cc413a1ac2680.

Reason for revert: Breaks vogar.

Change-Id: I561f577976648c10e5eec55bb8596c55ebd63948

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index c9f05b5..51327b3 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
+$$(rule_name): $$(dependencies) d8 d8-compat-dx
 	$(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 57a428f..8ac0a35 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -21,6 +21,7 @@
 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