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

Merge "Warn when defining a 32-bit product on a 64-bit device."

Browse Source 
am: 4788f5b094

Change-Id: I705ee5fb954c156e7e57dda684ce5d45b23ffb97
This commit is contained in:
Anton Hansson
2018-07-09 23:39:11 -07:00
committed by android-build-merger
parent 28b699fbbe 4788f5b094
commit bfc78def01
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/config.mk
View File

@@ -374,10 +374,18 @@ TARGET_PREFER_32_BIT_APPS := true
TARGET_PREFER_32_BIT_EXECUTABLES := true TARGET_PREFER_32_BIT_EXECUTABLES := true
endif endif
ifeq (,$(TARGET_SUPPORTS_32_BIT_APPS)$(TARGET_SUPPORTS_64_BIT_APPS)) ifeq (,$(filter true,$(TARGET_SUPPORTS_32_BIT_APPS) $(TARGET_SUPPORTS_64_BIT_APPS)))
TARGET_SUPPORTS_32_BIT_APPS := true TARGET_SUPPORTS_32_BIT_APPS := true
endif endif
# Sanity check to warn about likely cryptic errors later in the build.
ifeq ($(TARGET_IS_64_BIT),true)
ifeq (,$(filter true false,$(TARGET_SUPPORTS_64_BIT_APPS)))
$(warning Building a 32-bit-app-only product on a 64-bit device. \
If this is intentional, set TARGET_SUPPORTS_64_BIT_APPS := false)
endif
endif
# "ro.product.cpu.abilist32" and "ro.product.cpu.abilist64" are # "ro.product.cpu.abilist32" and "ro.product.cpu.abilist64" are
# comma separated lists of the 32 and 64 bit ABIs (in order of # comma separated lists of the 32 and 64 bit ABIs (in order of
# preference) that the target supports. If TARGET_CPU_ABI_LIST_{32,64}_BIT # preference) that the target supports. If TARGET_CPU_ABI_LIST_{32,64}_BIT

4
core/package.mk
View File

@@ -8,7 +8,9 @@ my_prefix := TARGET_
include $(BUILD_SYSTEM)/multilib.mk include $(BUILD_SYSTEM)/multilib.mk
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
ifneq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(my_module_multilib),|64) ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
my_module_multilib := first
else ifneq ($(my_module_multilib),64)
my_module_multilib := first my_module_multilib := first
endif endif
endif endif