From b6c061e9ffa5208b0b2dae0a5a88694925c6b527 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 1 Sep 2016 11:02:43 -0700 Subject: [PATCH] Package up proguard jack_dictionary Bug: 31182185 Test: m dist in an unbundled branch Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 138202627..8fc35270b 100644 --- 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; \