diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-17 11:47:18 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-31 17:04:00 -0700 |
| commit | 4d0c1f673f8a22f5415b9a879e4544f6bcfe419c (patch) | |
| tree | c447f7ce44b173333e2fc9b3c39f63ec21cfce2b | |
| parent | 382e06ce8eab506276aaad39da3fbd533ef898d2 (diff) | |
| download | bionic-4d0c1f673f8a22f5415b9a879e4544f6bcfe419c.zip bionic-4d0c1f673f8a22f5415b9a879e4544f6bcfe419c.tar.gz bionic-4d0c1f673f8a22f5415b9a879e4544f6bcfe419c.tar.bz2 | |
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
| -rw-r--r-- | tests/Android.build.mk | 1 | ||||
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/libs/Android.mk | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/tests/Android.build.mk b/tests/Android.build.mk index d54c851..63729da 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 f20eb7d..8b0b0a0 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 8746ff2..175a635 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. # ----------------------------------------------------------------------------- |