summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-07-14 21:41:35 -0700
committerBrian Carlstrom <bdc@google.com>2013-07-14 21:41:35 -0700
commit3795f2517f47702764f372086367c47d4cd776d9 (patch)
tree74f4b94b6bc1c7b53a23e41572c02ebda4764fc4
parent4478eb0a14a154fbdbaeef075dce8a5f8a33b25c (diff)
downloadart-3795f2517f47702764f372086367c47d4cd776d9.zip
art-3795f2517f47702764f372086367c47d4cd776d9.tar.gz
art-3795f2517f47702764f372086367c47d4cd776d9.tar.bz2
Use non-PHONY dependency to avoid rebuilding art gtests repeatedly.
Change-Id: I675552b68c3375204eb9ef356ce80aa9615f4ccf
-rw-r--r--build/Android.gtest.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 116ca9b..faff498 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -101,7 +101,12 @@ define build-art-test
LOCAL_SRC_FILES := $$(art_gtest_filename) runtime/common_test.cc
LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime art/compiler
LOCAL_SHARED_LIBRARIES := libartd-compiler libartd
- LOCAL_ADDITIONAL_DEPENDENCIES := dex2oatd # needed to go libartd-compilerd and libartd
+ # dex2oatd is needed to go libartd-compilerd and libartd
+ ifeq ($$(art_target_or_host),target)
+ LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_EXECUTABLES)/dex2oatd
+ else
+ LOCAL_ADDITIONAL_DEPENDENCIES := $(HOST_OUT_EXECUTABLES)/dex2oatd
+ endif
LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk
LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk