diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-04 08:16:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-04 08:16:19 +0000 |
| commit | e60143fa0ca1cb15c12fa971be8713deb797f673 (patch) | |
| tree | 05e4a28702c87c4f489f05f753afab62c789eaf6 | |
| parent | d1f4d14b703573afe890adfd6bf400a27421ca48 (diff) | |
| parent | a147d6ac85978c08504c35c576f0bc639a0ad5a3 (diff) | |
Remove reference to d8-compat-dx am: 1755ad0062 am: a147d6ac85
Change-Id: I8446546b242ecf7062581a92cfc0fded0fb00cbc
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 51327b3e42..c9f05b533d 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 d8-compat-dx +$$(rule_name): $$(dependencies) d8 $(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 8ac0a3544f..57a428f195 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -21,7 +21,6 @@ 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 |