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

Commit dc1c95aa authored by Colin Cross's avatar Colin Cross
Browse files

build: add support for LOCAL_MULTILIB := 64 

I don't expect it to be useful for modules, but package.mk will
use it to only install 64-bit native apps on devices that
only have a 64-bit zygote.

Change-Id: If3f5a81c3a60bd13fa6ded08e2a7579a29877324
parent d3624d5f

core/module_arch_supported.mk

+4 −0
Original line number Diff line number Diff line
@@ -25,12 +25,16 @@ endif 
ifeq ($(LOCAL_2ND_ARCH_VAR_PREFIX),)

ifeq ($(TARGET_IS_64_BIT)|$(my_module_multilib),true|32)

my_module_arch_supported := false

else ifeq ($(TARGET_IS_64_BIT)|$(my_module_multilib),|64)

my_module_arch_supported := false

else ifeq ($(call directory_is_64_bit_blacklisted,$(LOCAL_PATH)),true)

my_module_arch_supported := false

endif

else # LOCAL_2ND_ARCH_VAR_PREFIX

ifeq ($(my_module_multilib),first)

my_module_arch_supported := false

else ifeq ($(my_module_multilib),64)

my_module_arch_supported := false

endif

endif # LOCAL_2ND_ARCH_VAR_PREFIX

core/multilib.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ else ifeq ($(LOCAL_NO_2ND_ARCH),true) 
my_module_multilib := first

endif

else # my_module_multilib defined

ifeq (,$(filter 32 first both none,$(my_module_multilib)))

ifeq (,$(filter 32 64 first both none,$(my_module_multilib)))

$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE))

endif

endif # my_module_multilib defined