build: remove LOCAL_NO_2ND_ARCH
Delete LOCAL_NO_2ND_ARCH, it is no longer used. Equivalent
functionality is available with LOCAL_MULTILIB := first.
Change-Id: I36838a8a7e10b0a59ca0022c4c8a3a190e782c71
diff --git a/core/multilib.mk b/core/multilib.mk
index 8380249..f630c94 100644
--- a/core/multilib.mk
+++ b/core/multilib.mk
@@ -3,22 +3,11 @@
# setting in my_module_multilib, or empty if not set.
my_module_multilib := $(strip $(LOCAL_MULTILIB))
+
ifndef my_module_multilib
-ifeq ($(LOCAL_32_BIT_ONLY)|$(LOCAL_NO_2ND_ARCH),true|true)
-ifdef TARGET_2ND_ARCH
-# Both LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH specified on 64-bit target
-# skip the module completely
-my_module_multilib := none
-else
-# Both LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH specified on 32-bit target
-# build for 32-bit
+ifeq ($(LOCAL_32_BIT_ONLY),true)
my_module_multilib := 32
endif
-else ifeq ($(LOCAL_32_BIT_ONLY),true)
-my_module_multilib := 32
-else ifeq ($(LOCAL_NO_2ND_ARCH),true)
-my_module_multilib := first
-endif
else # my_module_multilib defined
ifeq (,$(filter 32 64 first both none,$(my_module_multilib)))
$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE))