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

am dec4de45: Merge "Correct way to specify additional dependencies"

Browse Source 
* commit 'dec4de456c046881fb1e8c7c7d0c27a11ef09eb7':
  Correct way to specify additional dependencies
This commit is contained in:
Dmitriy Ivanov
2014-10-17 20:34:39 +00:00
committed by Android Git Automerger
parent d7407db08f dec4de456c
commit 68c41a890d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Android.build.mk
View File

@@ -15,7 +15,7 @@
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(common_additional_dependencies)
LOCAL_MODULE := $(module) LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MODULE_TAGS := $(module_tag)

4
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.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -427,7 +429,5 @@ endif
endif # linux-x86 endif # linux-x86
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Android.build.mk
include $(call first-makefiles-under,$(LOCAL_PATH)) include $(call first-makefiles-under,$(LOCAL_PATH))
endif # !BUILD_TINY_ANDROID endif # !BUILD_TINY_ANDROID

12
tests/libs/Android.mk
View File

@@ -18,6 +18,12 @@ LOCAL_PATH := $(call my-dir)
TEST_PATH := $(LOCAL_PATH)/.. TEST_PATH := $(LOCAL_PATH)/..
common_cppflags += -std=gnu++11 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.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -348,9 +354,3 @@ libtest_dlsym_weak_func_src_files := \
module := libtest_dlsym_weak_func module := libtest_dlsym_weak_func
include $(LOCAL_PATH)/Android.build.testlib.mk 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