commit 61ecc585bd4d2ae64f6cb6cd4524a3292ff4f201
author Brian Carlstrom <bdc@google.com> Wed Jul 17 09:59:55 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 17 09:59:55 2013 -0700
tree 820fd4f4efb548afff81c4f8826b3977688109af
parent cf6aba685c25b5a0f9e65243416ed9a07cea98df
parent 17bfe263d8a37aa4da4c5088e4245dedaebc3ff8

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

* commit '17bfe263d8a37aa4da4c5088e4245dedaebc3ff8':
  Use LOCAL_REQUIRED_MODULES instead of LOCAL_ADDITIONAL_DEPENDENCIES so we only relink the tests on libart changes but do not recompile them.

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 0fb8b01..407cef9 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -107,13 +107,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.