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

Fix potential makefile bug.

Browse Source 
Since multilib is not set every time, it needs to be per module or
there is a change that another target will use the multilib value set
previously.

Change-Id: I5c30e18d5111705cb3f6e3d4cd9ef8a28c9b746c
This commit is contained in:
Christopher Ferris 2014-04-28 21:10:37 -07:00
parent 0fd2e87a0c
commit 5090964da0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Android.build.mk
View File

@ -18,8 +18,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := $(module) LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MODULE_TAGS := $(module_tag)
LOCAL_MULTILIB := $(multilib) LOCAL_MULTILIB := $($(module)_multilib)
ifeq ($(multilib),both) ifeq ($(LOCAL_MULTILIB),both)
LOCAL_MODULE_STEM_32 := $(module)32 LOCAL_MODULE_STEM_32 := $(module)32
LOCAL_MODULE_STEM_64 := $(module)64 LOCAL_MODULE_STEM_64 := $(module)64
endif endif

4
tests/Android.mk
View File

@ -221,7 +221,7 @@ bionic-unit-tests_shared_libraries_target := \
module := bionic-unit-tests module := bionic-unit-tests
module_tag := optional module_tag := optional
multilib := both bionic-unit-tests_multilib := both
build_type := target build_type := target
build_target := NATIVE_TEST build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk
@ -243,7 +243,7 @@ bionic-unit-tests-static_force_static_executable := true
module := bionic-unit-tests-static module := bionic-unit-tests-static
module_tag := optional module_tag := optional
multilib := both bionic-unit-tests-static_multilib := both
build_type := target build_type := target
build_target := NATIVE_TEST build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk