From: Dmitriy Ivanov <dimitry@google.com>
Date: Fri, 17 Oct 2014 18:47:18 +0000 (-0700)
Subject: Correct way to specify additional dependencies
X-Git-Tag: android-x86-6.0-r1~14^2^2~30
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4d0c1f673f8a22f5415b9a879e4544f6bcfe419c;p=android-x86%2Fbionic.git

Correct way to specify additional dependencies

 Previous one was not covering all the targets

Bug: 17548097
Bug: 18186310

(cherry picked from commit 4a9e1937c56511aef579312bf39ab345f9179230)

Change-Id: I2cd9e58893555d16cbfe291b2d1279621489d5ad
---

diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index d54c851b2..63729dace 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -15,6 +15,7 @@
 #
 
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(common_additional_dependencies)
 
 LOCAL_MODULE := $(module)
 LOCAL_MODULE_TAGS := $(module_tag)
diff --git a/tests/Android.mk b/tests/Android.mk
index f20eb7d82..8b0b0a0e0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -28,6 +28,8 @@ else
 build_host := false
 endif
 
+common_additional_dependencies := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Android.build.mk
+
 # -----------------------------------------------------------------------------
 # All standard tests.
 # -----------------------------------------------------------------------------
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 8746ff298..175a63539 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -17,6 +17,13 @@
 LOCAL_PATH := $(call my-dir)
 TEST_PATH := $(LOCAL_PATH)/..
 
+common_cppflags += -std=gnu++11
+common_additional_dependencies := \
+    $(LOCAL_PATH)/Android.mk \
+    $(LOCAL_PATH)/Android.build.dlext_testzip.mk \
+    $(LOCAL_PATH)/Android.build.testlib.mk \
+    $(TEST_PATH)/Android.build.mk
+
 # -----------------------------------------------------------------------------
 # Library used by dlfcn tests.
 # -----------------------------------------------------------------------------