Merge "build: remove LOCAL_NO_2ND_ARCH" (5b1fa1c8) · Commits · e / os / android_build

core/clear_vars.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,6 @@ LOCAL_HAL_STATIC_LIBRARIES:=
		LOCAL_NO_SYNTAX_CHECK:=
		LOCAL_NO_STATIC_ANALYZER:=
		LOCAL_32_BIT_ONLY:= # '',true
		LOCAL_NO_2ND_ARCH:= # '',true
		LOCAL_MODULE_TARGET_ARCH:=
		LOCAL_MODULE_TARGET_ARCH_WARN:=
		LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:=

+2 −13

Original line number	Diff line number	Diff line
		@@ -3,21 +3,10 @@
		# 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
		my_module_multilib := 32
		endif
		else ifeq ($(LOCAL_32_BIT_ONLY),true)
		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)))