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

Commit d3624d5f authored by Colin Cross's avatar Colin Cross
Browse files

build: fix TARGET_PREFER_32_BIT 

TARGET_PREFER_32_BIT can't assume that the 32-bit rule is allowed,
it needs to try the 32-bit rule first, then fall back to the 64-bit
rule in case the module specifies LOCAL_MODULE_TARGET_ARCH or
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH to disallow the 32-bit build.

Also port TARGET_PREFER_32_BIT to package.mk.

Change-Id: I07520b75c4ee11a1e95a82b3afa2a33d4907eb04
parent 13eaf184

core/executable.mk

+24 −21
Original line number Diff line number Diff line
@@ -8,19 +8,6 @@ 


include $(BUILD_SYSTEM)/multilib.mk



ifeq ($(TARGET_PREFER_32_BIT),true)

ifeq (,$(filter $(my_module_multilib),first both)

# if TARGET_PREFER_32_BIT is not explicitly set to "first" or "both"

# build only for secondary

my_module_multilib := 32

endif

endif



ifndef my_module_multilib

# executables default to building for the first architecture

my_module_multilib := first

endif



ifeq ($(my_module_multilib),both)

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

$(error $(LOCAL_PATH): LOCAL_MODULE_STEM_32 or LOCAL_MODULE_PATH_32 is required for LOCAL_MULTILIB := both for module $(LOCAL_MODULE))
@@ -32,26 +19,42 @@ else #!LOCAL_MULTILIB == both 
LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true

endif



my_skip_secondary_arch :=

# if TARGET_PREFER_32_BIT is set, try to build 32-bit first

ifdef TARGET_2ND_ARCH

ifeq ($(TARGET_PREFER_32_BIT),true)

LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

else

LOCAL_2ND_ARCH_VAR_PREFIX :=

endif

endif



my_skip_non_preferred_arch :=



# check if first arch is supported

# check if preferred arch is supported

include $(BUILD_SYSTEM)/module_arch_supported.mk

ifeq ($(my_module_arch_supported),true)

# first arch is supported

include $(BUILD_SYSTEM)/executable_internal.mk

ifneq ($(my_module_multilib),both)

my_skip_secondary_arch := true

my_skip_non_preferred_arch := true

endif

endif



# check if first arch was not supported or asked to build both

ifndef my_skip_secondary_arch

# check if preferred arch was not supported or asked to build both

ifndef my_skip_non_preferred_arch

ifdef TARGET_2ND_ARCH

# check if secondary arch is supported



# check if the non-preferred arch is the primary or secondary

ifeq ($(TARGET_PREFER_32_BIT),true)

LOCAL_2ND_ARCH_VAR_PREFIX :=

else

LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

endif



# check if non-preferred arch is supported

include $(BUILD_SYSTEM)/module_arch_supported.mk

ifeq ($(my_module_arch_supported),true)

# secondary arch is supported

# non-preferred arch is supported

OVERRIDE_BUILT_MODULE_PATH :=

LOCAL_BUILT_MODULE :=

LOCAL_INSTALLED_MODULE :=
@@ -62,7 +65,7 @@ LOCAL_INTERMEDIATE_TARGETS := 
include $(BUILD_SYSTEM)/executable_internal.mk

endif

endif # TARGET_2ND_ARCH

endif # !my_skip_secondary_arch || LOCAL_MULTILIB

endif # !my_skip_non_preferred_arch || LOCAL_MULTILIB

LOCAL_2ND_ARCH_VAR_PREFIX :=

LOCAL_NO_2ND_ARCH_MODULE_SUFFIX :=

core/package.mk

+16 −8
Original line number Diff line number Diff line
@@ -5,23 +5,31 @@ 


include $(BUILD_SYSTEM)/multilib.mk



ifndef my_module_multilib

# packages default to building for either architecture,

# the first if its supported, otherwise the second.

my_module_multilib := both

endif



LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true



# check if first arch is supported

# if TARGET_PREFER_32_BIT is set, try to build 32-bit first

ifdef TARGET_2ND_ARCH

ifeq ($(TARGET_PREFER_32_BIT),true)

LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

else

LOCAL_2ND_ARCH_VAR_PREFIX :=

endif

endif



# check if preferred arch is supported

include $(BUILD_SYSTEM)/module_arch_supported.mk

ifeq ($(my_module_arch_supported),true)

# first arch is supported

include $(BUILD_SYSTEM)/package_internal.mk

else ifneq (,$(TARGET_2ND_ARCH))

# check if secondary arch is supported

# check if the non-preferred arch is the primary or secondary

ifeq ($(TARGET_PREFER_32_BIT),true)

LOCAL_2ND_ARCH_VAR_PREFIX :=

else

LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

endif



# check if non-preferred arch is supported

include $(BUILD_SYSTEM)/module_arch_supported.mk

ifeq ($(my_module_arch_supported),true)

# secondary arch is supported