StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: split TARGET_PREFER_32_BIT for apps and executables

Browse Source 
Introduce two new flags, TARGET_PREFER_32_BIT_APPS and
TARGET_PREFER_32_BIT_EXECUTABLES that individually control
compilation of apps and executables.  If TARGET_PREFER_32_BIT is
set, the build system will automatically set both new flags.

Change-Id: Ibd2165e688675c2884d9e7ddf82d7dd6c28521f3
This commit is contained in:
Colin Cross
2014-04-30 18:09:13 -07:00
parent 847fd0311f
commit a3339e98e6
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/config.mk
View File

@@ -231,6 +231,11 @@ combo_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/combo/select.mk include $(BUILD_SYSTEM)/combo/select.mk
endif endif
ifdef TARGET_PREFER_32_BIT
TARGET_PREFER_32_BIT_APPS := true
TARGET_PREFER_32_BIT_EXECUTABLES := true
endif
# "ro.product.cpu.abilist" is a comma separated list of ABIs (in order # "ro.product.cpu.abilist" is a comma separated list of ABIs (in order
# of preference) that the target supports. If a TARGET_CPU_ABI_LIST # of preference) that the target supports. If a TARGET_CPU_ABI_LIST
# is specified by the board configuration, we use that. If not, we # is specified by the board configuration, we use that. If not, we

6
core/executable.mk
View File

@@ -19,9 +19,9 @@ else #!LOCAL_MULTILIB == both
LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
endif endif
# if TARGET_PREFER_32_BIT is set, try to build 32-bit first # if TARGET_PREFER_32_BIT_EXECUTABLES is set, try to build 32-bit first
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_PREFER_32_BIT),true) ifeq ($(TARGET_PREFER_32_BIT_EXECUTABLES),true)
LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
else else
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
@@ -45,7 +45,7 @@ ifndef my_skip_non_preferred_arch
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
# check if the non-preferred arch is the primary or secondary # check if the non-preferred arch is the primary or secondary
ifeq ($(TARGET_PREFER_32_BIT),true) ifeq ($(TARGET_PREFER_32_BIT_EXECUTABLES),true)
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
else else
LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

6
core/package.mk
View File

@@ -40,9 +40,9 @@ endif
LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true
# if TARGET_PREFER_32_BIT is set, try to build 32-bit first # if TARGET_PREFER_32_BIT_APPS is set, try to build 32-bit first
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(TARGET_PREFER_32_BIT),true) ifeq ($(TARGET_PREFER_32_BIT_APPS),true)
LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
else else
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
@@ -56,7 +56,7 @@ ifeq ($(my_module_arch_supported),true)
include $(BUILD_SYSTEM)/package_internal.mk include $(BUILD_SYSTEM)/package_internal.mk
else ifneq (,$(TARGET_2ND_ARCH)) else ifneq (,$(TARGET_2ND_ARCH))
# check if the non-preferred arch is the primary or secondary # check if the non-preferred arch is the primary or secondary
ifeq ($(TARGET_PREFER_32_BIT),true) ifeq ($(TARGET_PREFER_32_BIT_APPS),true)
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
else else
LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)