Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds"
This commit is contained in:
commit
2f9b9f0938
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue