Also package the unobfuscated classes.jar into proguard-dic.zip

proguard-dic.zip is generated and stored on the build server for
apps-only build.

Bug: 11811736
Change-Id: I2629dd1e28515d3b02f455f19b030ae291136559
This commit is contained in:
Ying Wang 2013-11-25 17:39:50 -08:00
parent f30718aa3d
commit 33d6459181

View file

@ -1454,7 +1454,8 @@ $(PROGUARD_DICT_ZIP) :
@echo "Packaging Proguard obfuscation dictionary files." @echo "Packaging Proguard obfuscation dictionary files."
$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \ $(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \
if [ -n "$$dict_files" ]; then \ if [ -n "$$dict_files" ]; then \
zip -q $@ $$dict_files; \ unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \
zip -q $@ $$dict_files $$unobfuscated_jars; \
else \ else \
touch $(dir $@)/dummy; \ touch $(dir $@)/dummy; \
(cd $(dir $@) && zip -q $(notdir $@) dummy); \ (cd $(dir $@) && zip -q $(notdir $@) dummy); \