Correct way to specify additional dependencies
Previous one was not covering all the targets
Bug: 17548097
Change-Id: I425e0f8d6e5a43feabd29dcb327049b82754d249
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 9562287..78f07ed 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -15,7 +15,7 @@
#
include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+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 f30a4a8..f65d82b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -28,6 +28,8 @@
build_host := false
endif
+common_additional_dependencies := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Android.build.mk
+
# -----------------------------------------------------------------------------
# All standard tests.
# -----------------------------------------------------------------------------
@@ -427,7 +429,5 @@
endif # linux-x86
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Android.build.mk
-
include $(call first-makefiles-under,$(LOCAL_PATH))
endif # !BUILD_TINY_ANDROID
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index ad2db0d..cfd7f2c 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -18,6 +18,12 @@
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.
# -----------------------------------------------------------------------------
@@ -348,9 +354,3 @@
module := libtest_dlsym_weak_func
include $(LOCAL_PATH)/Android.build.testlib.mk
-
-LOCAL_ADDITIONAL_DEPENDENCIES := \
- $(LOCAL_PATH)/Android.mk \
- $(LOCAL_PATH)/Android.build.dlext_testzip.mk \
- $(LOCAL_PATH)/Android.build.testlib.mk \
- $(TEST_PATH)/Android.build.mk
