Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 754daea8 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds" am:... 

Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds" am: 2f9b9f09 am: 8156e82f am: 26f8ac9a
am: 2a94e9dc

Change-Id: If22a3b766783a5ccf2731cde5792c711268290e1
parents 8e1a632a 2a94e9dc

core/package.mk

+6 −4
Original line number Diff line number Diff line
@@ -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.