p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Replace usages of my_register_name with my_all_targets" am: 077d9d5fe7 am: e373117cac 

am: 1f351ad75c

Change-Id: Ie0b935e6209a941cfe992276270b5b5b3e5c4f95
This commit is contained in:
Colin Cross 2016-09-21 02:28:59 +00:00 committed by android-build-merger
parent 8929f97e29 1f351ad75c
commit fba6042e11
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt_odex_install.mk
View File

@ -138,6 +138,6 @@ DEXPREOPT.MODULES.$(LOCAL_MODULE_CLASS) := $(sort \
# Make sure to install the .odex and .vdex when you run "make <module_name>"
$(my_register_name): $(installed_odex) $(installed_vdex)
$(my_all_targets): $(installed_odex) $(installed_vdex)
endif # LOCAL_DEX_PREOPT

4
core/package_internal.mk
View File

@ -579,7 +579,7 @@ ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \
$(foreach s,$(my_split_suffixes),$(built_module_path)/package_$(s).apk:$(my_module_path)/$(LOCAL_MODULE)_$(s).apk)
# Make sure to install the splits when you run "make <module_name>".
$(my_register_name): $(installed_apk_splits)
$(my_all_targets): $(installed_apk_splits)
ifdef LOCAL_COMPATIBILITY_SUITE
cts_testcase_file := $(foreach s,$(my_split_suffixes),$(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(LOCAL_MODULE)_$(s).apk)
@ -590,7 +590,7 @@ COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES := \
$(COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES) \
$(cts_testcase_file)
$(my_register_name) : $(cts_testcase_file)
$(my_all_targets) : $(cts_testcase_file)
endif # LOCAL_COMPATIBILITY_SUITE
endif # LOCAL_PACKAGE_SPLITS

2
core/prebuilt_internal.mk
View File

@ -358,7 +358,7 @@ ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \
$(foreach s,$(LOCAL_PACKAGE_SPLITS),$(built_module_path)/$(notdir $(s)):$(my_module_path)/$(notdir $(s)))
# Make sure to install the splits when you run "make <module_name>".
$(my_register_name): $(installed_apk_splits)
$(my_all_targets): $(installed_apk_splits)
endif # LOCAL_PACKAGE_SPLITS