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

Commit 5a9db90e authored by Colin Cross's avatar Colin Cross
Browse files

add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 

Some executables will need to be built for both 32-bit and 64-bit.
For linker/linker64, debuggerd/debuggerd64, and a few more, they
will be installed in the same path (/system/bin), but with different
filenames.  Allow the module to specify LOCAL_MODULE_STEM_32 and
LOCAL_MODULE_STEM_64 to name the two versions.

Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
parent 87974056

core/base_rules.mk

+1 −11
Original line number Diff line number Diff line
@@ -167,17 +167,7 @@ generated_sources_dir := $(call local-generated-sources-dir) 
###########################################################

# Pick a name for the intermediate and final targets

###########################################################

ifndef LOCAL_MODULE_STEM

  LOCAL_MODULE_STEM := $(LOCAL_MODULE)

endif



ifndef LOCAL_BUILT_MODULE_STEM

  LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)

endif



ifndef LOCAL_INSTALLED_MODULE_STEM

  LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)

endif

include $(BUILD_SYSTEM)/configure_module_stem.mk



# OVERRIDE_BUILT_MODULE_PATH is only allowed to be used by the

# internal SHARED_LIBRARIES build files.

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ LOCAL_C_INCLUDES_32:= 
LOCAL_C_INCLUDES_64:=

LOCAL_MODULE_PATH_32:=

LOCAL_MODULE_PATH_64:=

LOCAL_MODULE_STEM_32:=

LOCAL_MODULE_STEM_64:=



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

# iterate over thousands of entries every time.

core/configure_module_stem.mk

0 → 100644
+16 −0
Original line number Diff line number Diff line 
my_multilib_stem := $(LOCAL_MODULE_STEM_$(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32))

ifdef my_multilib_stem

LOCAL_MODULE_STEM := $(my_multilib_stem)

endif



ifndef LOCAL_MODULE_STEM

  LOCAL_MODULE_STEM := $(LOCAL_MODULE)

endif



ifndef LOCAL_BUILT_MODULE_STEM

  LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)

endif



ifndef LOCAL_INSTALLED_MODULE_STEM

  LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)

endif

core/dynamic_binary.mk

+3 −14
Original line number Diff line number Diff line
@@ -13,20 +13,9 @@ $(error This file should not be used to build host binaries. Included by (or ne 
endif



# The name of the target file, without any path prepended.

# TODO: This duplicates logic from base_rules.mk because we need to

# This duplicates logic from base_rules.mk because we need to

# know its results before base_rules.mk is included.

#       Consolidate the duplicates.

ifndef LOCAL_MODULE_STEM

  LOCAL_MODULE_STEM := $(LOCAL_MODULE)

endif



ifndef LOCAL_BUILT_MODULE_STEM

  LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)

endif



ifndef LOCAL_INSTALLED_MODULE_STEM

  LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)

endif

include $(BUILD_SYSTEM)/configure_module_stem.mk



# base_rules.make defines $(intermediates), but we need its value

# before we include base_rules.  Make a guess, and verify that

core/shared_library_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ endif 
ifneq ($(strip $(OVERRIDE_BUILT_MODULE_PATH)),)

$(error $(LOCAL_PATH): Illegal use of OVERRIDE_BUILT_MODULE_PATH)

endif

ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),)

ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)$(LOCAL_MODULE_STEM_32)$(LOCAL_MODULE_STEM_64)),)

$(error $(LOCAL_PATH): Cannot set module stem for a library)

endif