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

am 7fdab460: Merge "Fix potential makefile bug."

Browse Source 
* commit '7fdab460a9790959ce6c4201476a3ea982eb148e':
  Fix potential makefile bug.
This commit is contained in:
Christopher Ferris 2014-04-29 16:00:24 +00:00 committed by Android Git Automerger
commit a34e995557
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_TAGS := $(module_tag)
LOCAL_MULTILIB := $(multilib)
ifeq ($(multilib),both)
LOCAL_MULTILIB := $($(module)_multilib)
ifeq ($(LOCAL_MULTILIB),both)
LOCAL_MODULE_STEM_32 := $(module)32
LOCAL_MODULE_STEM_64 := $(module)64
endif

4
tests/Android.mk
View File

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