Package up proguard jack_dictionary

Bug: 31182185
Test: m dist in an unbundled branch
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af

diff --git a/core/Makefile b/core/Makefile
index 1382026..8fc3527 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -2128,7 +2128,7 @@ PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_
 # the dependency will be set up later in build/core/main.mk.
 $(PROGUARD_DICT_ZIP) :
        @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 -o -name jack_dictionary`; \
                if [ -n "$$dict_files" ]; then \
                  unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \
                  zip -qX $@ $$dict_files $$unobfuscated_jars; \