summaryrefslogtreecommitdiffstats
path: root/tests/Android.build.mk
diff options
context:
space:
mode:
Diffstat (limited to 'tests/Android.build.mk')
-rw-r--r--tests/Android.build.mk8
1 files changed, 8 insertions, 0 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))