Native tests are now multilib=both by default
Change-Id: I788ac0b871703c137727a65e017c4466127c0190
diff --git a/linker/tests/Android.mk b/linker/tests/Android.mk
index 683f9ee..fe64e77 100644
--- a/linker/tests/Android.mk
+++ b/linker/tests/Android.mk
@@ -19,7 +19,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MULTILIB := both
LOCAL_MODULE := linker-unit-tests
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 6433d55..62e9718 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -21,16 +21,12 @@
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 47e6272..ab4409f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -260,7 +260,6 @@
module := bionic-unit-tests
module_tag := optional
-bionic-unit-tests_multilib := both
build_type := target
build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk
@@ -282,7 +281,6 @@
module := bionic-unit-tests-static
module_tag := optional
-bionic-unit-tests-static_multilib := both
build_type := target
build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk
@@ -308,7 +306,6 @@
module := bionic-unit-tests-glibc
module_tag := optional
-bionic-unit-tests-glibc_multilib := both
build_type := host
build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk
