summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-11-08 04:10:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-11-08 04:10:05 +0000
commit3b7ce4ecc6994ea73022c1c4d2df7a3f4fc7471c (patch)
tree88739ba4332f32191aff514de261dd4ccdc6b229
parentcefd676fb79d225fcd7e8e8c0ef141d70a2f45b8 (diff)
parent45c899b8c1a7cdd58b2109b73138499372b220d1 (diff)
Merge "Fix missing dependencies in master-art-host"
-rw-r--r--test/Android.run-test.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 4b49142e10..69e4b874f8 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -24,6 +24,12 @@ TEST_ART_RUN_TEST_DEPENDENCIES := \
$(HOST_OUT_EXECUTABLES)/smali \
$(HOST_OUT_EXECUTABLES)/dexmerger
+# Add d8 dependency, if enabled.
+ifeq ($(USE_D8),true)
+TEST_ART_RUN_TEST_DEPENDENCIES += \
+ $(HOST_OUT_EXECUTABLES)/d8
+endif
+
# Convert's a rule name to the form used in variables, e.g. no-relocate to NO_RELOCATE
define name-to-var
$(shell echo $(1) | tr '[:lower:]' '[:upper:]' | tr '-' '_')