diff options
| -rw-r--r-- | tests/Android.build.mk | 8 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/Android.build.mk b/tests/Android.build.mk index c1a0f16..e65ec16 100644 --- a/tests/Android.build.mk +++ b/tests/Android.build.mk @@ -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)) diff --git a/tests/Android.mk b/tests/Android.mk index 56b1ef1..c2e76b6 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -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 \ |