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

Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds

Browse Source 
64-bit only apps should only be enabled if the target supports 64-bit.

Test: lunch aosp_x86_arm-userdebug; m -j PMTest_Java64
Change-Id: Ibdc863730e97b1a89efb44840a1c633e9951a1d1
This commit is contained in:
Dan Willemsen
2017-04-20 10:59:06 -07:00
parent e4d92ef568
commit 2e3c3cf537
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/package.mk
View File

@@ -4,13 +4,15 @@
$(call record-module-type,PACKAGE) $(call record-module-type,PACKAGE)
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first
endif
my_prefix := TARGET_ my_prefix := TARGET_
include $(BUILD_SYSTEM)/multilib.mk include $(BUILD_SYSTEM)/multilib.mk
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
ifneq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(my_module_multilib),|64)
my_module_multilib := first
endif
endif
ifeq ($(TARGET_SUPPORTS_32_BIT_APPS)|$(TARGET_SUPPORTS_64_BIT_APPS),true|true) ifeq ($(TARGET_SUPPORTS_32_BIT_APPS)|$(TARGET_SUPPORTS_64_BIT_APPS),true|true)
# packages default to building for either architecture, # packages default to building for either architecture,
# the preferred if its supported, otherwise the non-preferred. # the preferred if its supported, otherwise the non-preferred.