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

am 72f0cf56: Merge "Convert comma in split arguments to underscore." into lmp-dev 

* commit '72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6':
  Convert comma in split arguments to underscore.
This commit is contained in:
Ying Wang 2014-10-02 01:08:07 +00:00 committed by Android Git Automerger
parent 3bbc52fb2c 72f0cf56b3
commit faf374a095
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/package_internal.mk
View File

@ -423,8 +423,10 @@ endif
## APK splits ## APK splits
ifdef LOCAL_PACKAGE_SPLITS ifdef LOCAL_PACKAGE_SPLITS
# LOCAL_PACKAGE_SPLITS is a list of resource labels. # LOCAL_PACKAGE_SPLITS is a list of resource labels.
built_apk_splits := $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(built_module_path)/package_$(s).apk) # aapt will convert comma inside resource lable to underscore in the file names.
installed_apk_splits := $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(my_module_path)/$(LOCAL_MODULE)_$(s).apk) my_split_suffixes := $(subst $(comma),_,$(LOCAL_PACKAGE_SPLITS))
built_apk_splits := $(foreach s,$(my_split_suffixes),$(built_module_path)/package_$(s).apk)
installed_apk_splits := $(foreach s,$(my_split_suffixes),$(my_module_path)/$(LOCAL_MODULE)_$(s).apk)
# The splits should have been built in the same command building the base apk. # The splits should have been built in the same command building the base apk.
# This rule just runs signing and zipalign etc. # This rule just runs signing and zipalign etc.
@ -449,7 +451,7 @@ $(installed_apk_splits) : $(my_module_path)/$(LOCAL_MODULE)_%.apk : $(built_modu
# Register the additional built and installed files. # Register the additional built and installed files.
ALL_MODULES.$(my_register_name).INSTALLED += $(installed_apk_splits) ALL_MODULES.$(my_register_name).INSTALLED += $(installed_apk_splits)
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \ ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \
$(foreach s,$(LOCAL_PACKAGE_SPLITS),$(built_module_path)/package_$(s).apk:$(my_module_path)/$(LOCAL_MODULE)_$(s).apk) $(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>". # Make sure to install the splits when you run "make <module_name>".
$(my_register_name): $(installed_apk_splits) $(my_register_name): $(installed_apk_splits)