diff options
| author | 2019-12-04 09:06:41 +0000 | |
|---|---|---|
| committer | 2019-12-04 19:36:21 +0000 | |
| commit | 1caa1270a53fa08ab9c6934d5bdd2da79c7bf89e (patch) | |
| tree | 575686667078218972034ec7d695310c5aa88567 | |
| parent | a142f712dffa675e3cd175bca89f37ff7160a07f (diff) | |
Revert "Remove reference to d8-compat-dx"
This reverts commit 1755ad0062e97d0e358c65600fd5e51b40b85d95.
Reason for revert: Potential culprit for Bug 145645482 - verifying through Forrest before revert submission
Change-Id: I56d829b824630b0a5a408c1d8cda75086ebbb89d
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index c9f05b533d..51327b3e42 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -745,7 +745,7 @@ define define-test-art-gtest-combination 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. diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 57a428f195..8ac0a3544f 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -21,6 +21,7 @@ include art/build/Android.common_test.mk 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 |