tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM

Browse source 
* commit 'b6da30c3724cc2a452be2c1ae425eff4f7d55944':
  Allow module to specify LOCAL_INSTALLED_MODULE_STEM
This commit is contained in:
Ying Wang 2013-09-25 12:37:19 -07:00 committed by Android Git Automerger
commit 392d042c21
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/base_rules.mk
View file

@ -141,15 +141,16 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON)
########################################################### ###########################################################
# Pick a name for the intermediate and final targets # Pick a name for the intermediate and final targets
########################################################### ###########################################################
LOCAL_MODULE_STEM := $(strip $(LOCAL_MODULE_STEM)) ifndef LOCAL_MODULE_STEM
ifeq ($(LOCAL_MODULE_STEM),)
LOCAL_MODULE_STEM := $(LOCAL_MODULE) LOCAL_MODULE_STEM := $(LOCAL_MODULE)
endif endif
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)
LOCAL_BUILT_MODULE_STEM := $(strip $(LOCAL_BUILT_MODULE_STEM)) ifndef LOCAL_BUILT_MODULE_STEM
ifeq ($(LOCAL_BUILT_MODULE_STEM),) LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)
LOCAL_BUILT_MODULE_STEM := $(LOCAL_INSTALLED_MODULE_STEM) endif
ifndef LOCAL_INSTALLED_MODULE_STEM
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)
endif endif
# OVERRIDE_BUILT_MODULE_PATH is only allowed to be used by the # OVERRIDE_BUILT_MODULE_PATH is only allowed to be used by the

1
core/clear_vars.mk
View file

@ -11,6 +11,7 @@ LOCAL_BUILT_MODULE:=
LOCAL_BUILT_MODULE_STEM:= LOCAL_BUILT_MODULE_STEM:=
OVERRIDE_BUILT_MODULE_PATH:= OVERRIDE_BUILT_MODULE_PATH:=
LOCAL_INSTALLED_MODULE:= LOCAL_INSTALLED_MODULE:=
LOCAL_INSTALLED_MODULE_STEM:=
LOCAL_UNINSTALLABLE_MODULE:= LOCAL_UNINSTALLABLE_MODULE:=
LOCAL_INTERMEDIATE_TARGETS:= LOCAL_INTERMEDIATE_TARGETS:=
LOCAL_UNSTRIPPED_PATH:= LOCAL_UNSTRIPPED_PATH:=

15
core/dynamic_binary.mk
View file

@ -26,12 +26,17 @@ endif
# TODO: This duplicates logic from base_rules.mk because we need to # TODO: This duplicates logic from base_rules.mk because we need to
# know its results before base_rules.mk is included. # know its results before base_rules.mk is included.
# Consolidate the duplicates. # Consolidate the duplicates.
LOCAL_MODULE_STEM := $(strip $(LOCAL_MODULE_STEM)) ifndef LOCAL_MODULE_STEM
ifeq ($(LOCAL_MODULE_STEM),)
LOCAL_MODULE_STEM := $(LOCAL_MODULE) LOCAL_MODULE_STEM := $(LOCAL_MODULE)
endif endif
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX)
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
# base_rules.make defines $(intermediates), but we need its value # base_rules.make defines $(intermediates), but we need its value
# before we include base_rules. Make a guess, and verify that # before we include base_rules. Make a guess, and verify that
@ -90,7 +95,7 @@ endif
## Store a copy with symbols for symbolic debugging ## Store a copy with symbols for symbolic debugging
########################################################### ###########################################################
symbolic_input := $(compress_output) 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) $(symbolic_output) : $(symbolic_input) | $(ACP)
@echo "target Symbolic: $(PRIVATE_MODULE) ($@)" @echo "target Symbolic: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target) $(copy-file-to-target)