* commit 'd9d37cfe218c83c99aa77e6f057b737e5ddc2061': Allow bionic-unit-tests-glibc to be built again.
This commit is contained in:
commit
33537e3190
@ -18,11 +18,19 @@ include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := $(module)
|
||||
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))
|
||||
|
||||
|
@ -365,7 +365,7 @@ include $(LOCAL_PATH)/Android.build.mk
|
||||
# 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 := \
|
||||
atexit_test.cpp \
|
||||
|
Loading…
Reference in New Issue
Block a user