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

am 105ef36c: Merge "Native tests are now multilib=both by default"

Browse Source 
* commit '105ef36c67baeebd2fd9c24b6140953afba4f160':
  Native tests are now multilib=both by default
This commit is contained in:
Dmitriy Ivanov 2014-07-01 23:08:01 +00:00 committed by Android Git Automerger
commit 711b5584db
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linker/tests/Android.mk
View File

@ -19,7 +19,6 @@ ifneq ($(BUILD_TINY_ANDROID),true)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MULTILIB := both
LOCAL_MODULE := linker-unit-tests
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64

4
tests/Android.build.mk
View File

@ -21,16 +21,12 @@ LOCAL_MODULE_TAGS := $(module_tag)
ifeq ($(build_type),host)
# Always make host multilib
LOCAL_MULTILIB := both
else
LOCAL_MULTILIB := $($(module)_multilib)
endif
ifneq ($(findstring LIBRARY, $(build_target)),LIBRARY)
ifeq ($(LOCAL_MULTILIB),both)
LOCAL_MODULE_STEM_32 := $(module)32
LOCAL_MODULE_STEM_64 := $(module)64
endif
endif
LOCAL_CLANG := $($(module)_clang_$(build_type))

3
tests/Android.mk
View File

@ -260,7 +260,6 @@ bionic-unit-tests_shared_libraries_target := \
module := bionic-unit-tests
module_tag := optional
bionic-unit-tests_multilib := both
build_type := target
build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk
@ -282,7 +281,6 @@ bionic-unit-tests-static_force_static_executable := true
module := bionic-unit-tests-static
module_tag := optional
bionic-unit-tests-static_multilib := both
build_type := target
build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk
@ -308,7 +306,6 @@ bionic-unit-tests-glibc_cppflags := \
module := bionic-unit-tests-glibc
module_tag := optional
bionic-unit-tests-glibc_multilib := both
build_type := host
build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk