summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorRichard Uhler <ruhler@google.com>2015-03-12 20:07:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-12 20:07:59 +0000
commit26584ca6cee6891cf96434400b469e83a4256e84 (patch)
tree4d6e76d8725b7ddb0ff02223bc129d189802a3e7 /build
parent510abc71bd8a5ba42079a851783aba31036c54ea (diff)
parent9a44f878d2ee8a58a42a0291ba026d57bc664b26 (diff)
downloadart-26584ca6cee6891cf96434400b469e83a4256e84.zip
art-26584ca6cee6891cf96434400b469e83a4256e84.tar.gz
art-26584ca6cee6891cf96434400b469e83a4256e84.tar.bz2
Merge "Add missing patchoatd dependency for oat_file_assistant_test."
Diffstat (limited to 'build')
-rw-r--r--build/Android.gtest.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 09790fe..6b6a9e0 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -77,8 +77,14 @@ ART_GTEST_transaction_test_DEX_DEPS := Transaction
ART_GTEST_elf_writer_test_HOST_DEPS := $(HOST_CORE_IMAGE_default_no-pic_64) $(HOST_CORE_IMAGE_default_no-pic_32)
ART_GTEST_elf_writer_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_default_no-pic_64) $(TARGET_CORE_IMAGE_default_no-pic_32)
-ART_GTEST_oat_file_assistant_test_HOST_DEPS := $(HOST_CORE_IMAGE_default_no-pic_64) $(HOST_CORE_IMAGE_default_no-pic_32)
-ART_GTEST_oat_file_assistant_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_default_no-pic_64) $(TARGET_CORE_IMAGE_default_no-pic_32)
+ART_GTEST_oat_file_assistant_test_HOST_DEPS := \
+ $(HOST_CORE_IMAGE_default_no-pic_64) \
+ $(HOST_CORE_IMAGE_default_no-pic_32) \
+ $(HOST_OUT_EXECUTABLES)/patchoatd
+ART_GTEST_oat_file_assistant_test_TARGET_DEPS := \
+ $(TARGET_CORE_IMAGE_default_no-pic_64) \
+ $(TARGET_CORE_IMAGE_default_no-pic_32) \
+ $(TARGET_OUT_EXECUTABLES)/patchoatd
# TODO: document why this is needed.
ART_GTEST_proxy_test_HOST_DEPS := $(HOST_CORE_IMAGE_default_no-pic_64) $(HOST_CORE_IMAGE_default_no-pic_32)