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

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

add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 

Some executables will need to be built for both 32-bit and 64-bit.
For tests, it will be convienient to keep the name of the executable
the same, but install them in a different location.  Add
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module
to specify different paths for 32-bit and 64-bit executables.

Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
parent 01aa01db

core/base_rules.mk

+13 −0
Original line number Diff line number Diff line
@@ -99,8 +99,21 @@ ifneq ($(words $(LOCAL_MODULE_CLASS)),1) 
  $(error $(LOCAL_PATH): LOCAL_MODULE_CLASS must contain exactly one word, not "$(LOCAL_MODULE_CLASS)")

endif



ifndef LOCAL_IS_HOST_MODULE

my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32)

endif



ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

ifndef LOCAL_IS_HOST_MODULE

my_multilib_module_path := $(strip $(LOCAL_MODULE_PATH_$(my_32_64_bit_suffix)))

else

my_multilib_module_path :=

endif

ifdef my_multilib_module_path

my_module_path := $(my_multilib_module_path)

else

my_module_path := $(strip $(LOCAL_MODULE_PATH))

endif

my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH))

ifeq ($(my_module_path),)

  ifdef LOCAL_IS_HOST_MODULE

core/binary.mk

+0 −2
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ my_c_includes := $(LOCAL_C_INCLUDES) 
my_generated_sources := $(LOCAL_GENERATED_SOURCES)



ifndef LOCAL_IS_HOST_MODULE

my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32)



my_src_files += $(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SRC_FILES_$(my_32_64_bit_suffix))

my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SHARED_LIBRARIES_$(my_32_64_bit_suffix))

my_cflags += $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix))

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ LOCAL_ASFLAGS_32:= 
LOCAL_ASFLAGS_64:=

LOCAL_C_INCLUDES_32:=

LOCAL_C_INCLUDES_64:=

LOCAL_MODULE_PATH_32:=

LOCAL_MODULE_PATH_64:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.