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

Merge "Allow bionic-unit-tests-glibc to be built again."

Browse Source
This commit is contained in:
Christopher Ferris 2014-06-11 03:07:27 +00:00 committed by Gerrit Code Review
commit 30d15e5499
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Android.build.mk
View File

@ -18,11 +18,19 @@ include $(CLEAR_VARS)
LOCAL_MODULE := $(module) LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MODULE_TAGS := $(module_tag)
ifeq ($(build_type),host)
# Always make host multilib
LOCAL_MULTILIB := both
else
LOCAL_MULTILIB := $($(module)_multilib) LOCAL_MULTILIB := $($(module)_multilib)
endif
ifneq ($(findstring LIBRARY, $(build_target)),LIBRARY)
ifeq ($(LOCAL_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
endif
LOCAL_CLANG := $($(module)_clang_$(build_type)) LOCAL_CLANG := $($(module)_clang_$(build_type))

2
tests/Android.mk
View File

@ -365,7 +365,7 @@ include $(LOCAL_PATH)/Android.build.mk
# cd bionic/tests; mm bionic-unit-tests-glibc-run # cd bionic/tests; mm bionic-unit-tests-glibc-run
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
bionic-unit-tests-glibc_src_files := \ bionic-unit-tests-glibc_src_files := \
atexit_test.cpp \ atexit_test.cpp \