generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct way to specify additional dependencies

Browse Source 
Previous one was not covering all the targets

Bug: 17548097
Bug: 18186310

(cherry picked from commit 4a9e1937c56511aef579312bf39ab345f9179230)

Change-Id: I2cd9e58893555d16cbfe291b2d1279621489d5ad
This commit is contained in:
Dmitriy Ivanov 2014-10-17 11:47:18 -07:00
parent 382e06ce8e
commit 4d0c1f673f
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Android.build.mk
View File

@ -15,6 +15,7 @@
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_additional_dependencies)
LOCAL_MODULE := $(module) LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MODULE_TAGS := $(module_tag)

2
tests/Android.mk
View File

@ -28,6 +28,8 @@ else
build_host := false build_host := false
endif endif
common_additional_dependencies := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# All standard tests. # All standard tests.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

7
tests/libs/Android.mk
View File

@ -17,6 +17,13 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
TEST_PATH := $(LOCAL_PATH)/.. 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. # Library used by dlfcn tests.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------