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

Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds"

Browse Source 
am: 2f9b9f0938

Change-Id: Ib95c950f13747a8476bcf9fb5876acab892d75ee
This commit is contained in:
Dan Willemsen
2017-04-20 21:17:14 +00:00
committed by android-build-merger
parent 625820cf3a 2f9b9f0938
commit 8156e82fa7
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)
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
LOCAL_MULTILIB := first
endif
my_prefix := TARGET_
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)
# packages default to building for either architecture,
# the preferred if its supported, otherwise the non-preferred.