From c93b8b56a272cac8b235e893b20dc303020b8634 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 19 Dec 2014 23:12:25 -0800 Subject: [PATCH] ART: Add imgdiag_test test dependency The test depends on the binaries. Make sure they are done before we run the test. Change-Id: I76e6458b725ba99746772223b2fe961080d1662b --- build/Android.gtest.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 4c19ba0b4..51072011d 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -66,8 +66,16 @@ ART_GTEST_elf_writer_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_default_no-pic_64) ART_GTEST_proxy_test_HOST_DEPS := $(HOST_CORE_IMAGE_default_no-pic_64) $(HOST_CORE_IMAGE_default_no-pic_32) # The imgdiag test has dependencies on core.oat since it needs to load it during the test. -ART_GTEST_imgdiag_test_HOST_DEPS := $(HOST_CORE_IMAGE_default_no-pic_64) $(HOST_CORE_IMAGE_default_no-pic_32) -ART_GTEST_imgdiag_test_TARGET_DEPS := $(TARGET_CORE_IMAGE_default_no-pic_64) $(TARGET_CORE_IMAGE_default_no-pic_32) +# For the host, also add the installed tool (in the base size, that should suffice). For the +# target, just the module is fine, the sync will happen late enough. +ART_GTEST_imgdiag_test_HOST_DEPS := \ + $(HOST_CORE_IMAGE_default_no-pic_64) \ + $(HOST_CORE_IMAGE_default_no-pic_32) \ + $(HOST_OUT_EXECUTABLES)/imgdiagd +ART_GTEST_imgdiag_test_TARGET_DEPS := \ + $(TARGET_CORE_IMAGE_default_no-pic_64) \ + $(TARGET_CORE_IMAGE_default_no-pic_32) \ + imgdiagd # The path for which all the source files are relative, not actually the current directory. LOCAL_PATH := art -- 2.11.0