diff options
| author | Ying Wang <wangying@google.com> | 2014-10-02 01:00:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 01:00:04 +0000 |
| commit | 72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6 (patch) | |
| tree | f1d9bfe24d1d3170ebea04e1f561ea96da743a04 | |
| parent | 1de169124df75618026b0264dbf782f336291f32 (diff) | |
| parent | 114a0fca3b6c23ab00c0e09c0cdb762740de2514 (diff) | |
| download | build-72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6.tar.gz | |
Merge "Convert comma in split arguments to underscore." into lmp-dev
| -rw-r--r-- | core/package_internal.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 6ce3678348..bb458d4776 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -423,8 +423,10 @@ endif ## APK splits ifdef LOCAL_PACKAGE_SPLITS # LOCAL_PACKAGE_SPLITS is a list of resource labels. -built_apk_splits := $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(built_module_path)/package_$(s).apk) -installed_apk_splits := $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(my_module_path)/$(LOCAL_MODULE)_$(s).apk) +# aapt will convert comma inside resource lable to underscore in the file names. +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. # 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. ALL_MODULES.$(my_register_name).INSTALLED += $(installed_apk_splits) 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>". $(my_register_name): $(installed_apk_splits) |