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

Commit 2e3c3cf5 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds 

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
parent e4d92ef5

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.