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

Commit b6da30c3 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM 

* commit '2408479c':
  Allow module to specify LOCAL_INSTALLED_MODULE_STEM
parents 55dc7844 2408479c

core/base_rules.mk

+7 −6
Original line number Diff line number Diff line
@@ -137,15 +137,16 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON) 
###########################################################

# Pick a name for the intermediate and final targets

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

LOCAL_MODULE_STEM := $(strip $(LOCAL_MODULE_STEM))

ifeq ($(LOCAL_MODULE_STEM),)

ifndef LOCAL_MODULE_STEM

  LOCAL_MODULE_STEM := $(LOCAL_MODULE)

endif

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)



LOCAL_BUILT_MODULE_STEM := $(strip $(LOCAL_BUILT_MODULE_STEM))

ifeq ($(LOCAL_BUILT_MODULE_STEM),)

  LOCAL_BUILT_MODULE_STEM := $(LOCAL_INSTALLED_MODULE_STEM)

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



# OVERRIDE_BUILT_MODULE_PATH is only allowed to be used by the

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ LOCAL_BUILT_MODULE:= 
LOCAL_BUILT_MODULE_STEM:=

OVERRIDE_BUILT_MODULE_PATH:=

LOCAL_INSTALLED_MODULE:=

LOCAL_INSTALLED_MODULE_STEM:=

LOCAL_UNINSTALLABLE_MODULE:=

LOCAL_INTERMEDIATE_TARGETS:=

LOCAL_UNSTRIPPED_PATH:=

core/dynamic_binary.mk

+10 −5
Original line number Diff line number Diff line
@@ -26,12 +26,17 @@ endif 
# TODO: This duplicates logic from base_rules.mk because we need to

#       know its results before base_rules.mk is included.

#       Consolidate the duplicates.

LOCAL_MODULE_STEM := $(strip $(LOCAL_MODULE_STEM))

ifeq ($(LOCAL_MODULE_STEM),)

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)

LOCAL_BUILT_MODULE_STEM := $(LOCAL_INSTALLED_MODULE_STEM)

endif



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

# before we include base_rules.  Make a guess, and verify that
@@ -90,7 +95,7 @@ endif 
## Store a copy with symbols for symbolic debugging

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

symbolic_input := $(compress_output)

symbolic_output := $(LOCAL_UNSTRIPPED_PATH)/$(LOCAL_BUILT_MODULE_STEM)

symbolic_output := $(LOCAL_UNSTRIPPED_PATH)/$(LOCAL_INSTALLED_MODULE_STEM)

$(symbolic_output) : $(symbolic_input) | $(ACP)

	@echo "target Symbolic: $(PRIVATE_MODULE) ($@)"

	$(copy-file-to-target)