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
diff --git a/core/Makefile b/core/Makefile
index 8bbc93b..a6f07c8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1454,7 +1454,8 @@
@echo "Packaging Proguard obfuscation dictionary files."
$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \
if [ -n "$$dict_files" ]; then \
- zip -q $@ $$dict_files; \
+ unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \
+ zip -q $@ $$dict_files $$unobfuscated_jars; \
else \
touch $(dir $@)/dummy; \
(cd $(dir $@) && zip -q $(notdir $@) dummy); \