diff options
| author | Christopher Ferris <cferris@google.com> | 2014-06-11 03:07:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 22:20:24 +0000 |
| commit | 30d15e5499ab097e1074b4e78e4397f5429975ac (patch) | |
| tree | c69e3320ca0ac7be4851522bc1a8abc2f747f480 | |
| parent | bdb8b21d0547dd74c62af3ddc9b8e7670adcbe9f (diff) | |
| parent | e9f7a9c340a3af11de720042fdc5061b65dc9b78 (diff) | |
| download | bionic-30d15e5499ab097e1074b4e78e4397f5429975ac.zip bionic-30d15e5499ab097e1074b4e78e4397f5429975ac.tar.gz bionic-30d15e5499ab097e1074b4e78e4397f5429975ac.tar.bz2 | |
Merge "Allow bionic-unit-tests-glibc to be built again."
| -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 \ |