summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ying Wang <wangying@google.com> 2015-07-08 14:09:10 -0700
committer Ying Wang <wangying@google.com> 2015-07-08 14:33:51 -0700
commit882a4f314b775445f36b486cb147b432cbb66617 (patch)
tree803df57dc1ddc77beaf3af852d112d9b7cdd13eb
parent784c6aee9cde7fc0e39a9f0c8b93d120e5f6dc3b (diff)
Have test-art-host-dexdump specifically depend on the host binaries.
dexdump2 and dexlist2 are phony targets representing both the host and target binaries. Also set environmental variable ANDROID_HOST_OUT=$(realpath $(HOST_OUT)) before calling art/test/dexdump/run-all-tests. art/test/dexdump/run-all-tests references ANDROID_HOST_OUT, which may be not set up by the user if he didn't run build/envsetup.sh. Bug: 22343844 Change-Id: I38b5f3efccd5817d7d9ff0e91b5c6d070b546d77
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index ff39d5328e..c01464a041 100644
--- a/Android.mk
+++ b/Android.mk
@@ -240,8 +240,8 @@ endif
# Dexdump/list regression test.
.PHONY: test-art-host-dexdump
-test-art-host-dexdump: dexdump2 dexlist2
- art/test/dexdump/run-all-tests
+test-art-host-dexdump: $(addprefix $(HOST_OUT_EXECUTABLES)/, dexdump2 dexlist2)
+ ANDROID_HOST_OUT=$(realpath $(HOST_OUT)) art/test/dexdump/run-all-tests
# Valgrind. Currently only 32b gtests.
.PHONY: valgrind-test-art-host