commit 17bfe263d8a37aa4da4c5088e4245dedaebc3ff8
author Brian Carlstrom <bdc@google.com> Tue Jul 16 17:31:22 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Jul 17 09:50:05 2013 -0700
tree 28f8c7403efeb3ea1d3199450299089e19a6e432
parent 0cb7853dec0ccc99c5d21f6b591b315710a15922

Use LOCAL_REQUIRED_MODULES instead of LOCAL_ADDITIONAL_DEPENDENCIES so we only relink the tests on libart changes but do not recompile them.

Change-Id: I47d7cdaa51749970eccac8528b032448a26b6e91

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index f5f5a4d..2b677be 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -102,13 +102,9 @@
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime art/compiler
   LOCAL_SHARED_LIBRARIES := libartd-compiler libartd
   # dex2oatd is needed to go libartd-compiler 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_REQUIRED_MODULES := dex2oatd 
 
-  LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk
+  LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk
 
   # Mac OS linker doesn't understand --export-dynamic.