Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 149d65b1 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent f702d6d1

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:=

core/multilib.mk

+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)))