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

Commit 6e85f8b0 authored by Ying Wang's avatar Ying Wang
Browse files

Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted 

Otherwise we may end up conflict between LOCAL_MODULE_HOST_ARCH and the
default multilib mode.
Also removed the unneeded variants of LOCAL_MODULE_HOST_ARCH.

Change-Id: I9e5a0144da3cb6310be0ddf098738987e51305de
parent e1b867dd

core/clear_vars.mk

+0 −3
Original line number Diff line number Diff line
@@ -152,9 +152,6 @@ LOCAL_MODULE_TARGET_ARCH_WARN:= 
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:=

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:=

LOCAL_MODULE_HOST_ARCH:=

LOCAL_MODULE_HOST_ARCH_WARN:=

LOCAL_MODULE_UNSUPPORTED_HOST_ARCH:=

LOCAL_MODULE_UNSUPPORTED_HOST_ARCH_WARN:=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/host_executable.mk

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
my_prefix := HOST_

include $(BUILD_SYSTEM)/multilib.mk



ifndef LOCAL_MODULE_HOST_ARCH

ifndef my_module_multilib

ifeq ($(HOST_PREFER_32_BIT),true)

my_module_multilib := 32
@@ -10,6 +11,7 @@ else 
my_module_multilib := first

endif

endif

endif



ifeq ($(my_module_multilib),both)

ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),)

core/host_shared_library.mk

+2 −0
Original line number Diff line number Diff line 
my_prefix := HOST_

include $(BUILD_SYSTEM)/multilib.mk



ifndef LOCAL_MODULE_HOST_ARCH

ifndef my_module_multilib

ifeq ($(HOST_PREFER_32_BIT),true)

my_module_multilib := 32
@@ -9,6 +10,7 @@ else 
my_module_multilib := first

endif

endif

endif



LOCAL_2ND_ARCH_VAR_PREFIX :=

include $(BUILD_SYSTEM)/module_arch_supported.mk

core/host_static_library.mk

+2 −0
Original line number Diff line number Diff line 
my_prefix := HOST_

include $(BUILD_SYSTEM)/multilib.mk



ifndef LOCAL_MODULE_HOST_ARCH

ifndef my_module_multilib

ifeq ($(HOST_PREFER_32_BIT),true)

my_module_multilib := 32
@@ -9,6 +10,7 @@ else 
my_module_multilib := first

endif

endif

endif



LOCAL_2ND_ARCH_VAR_PREFIX :=

include $(BUILD_SYSTEM)/module_arch_supported.mk