Merge "Package up proguard jack_dictionary" am: f7d1a6d75f am: e875b39791

am: f56a3b2513

Change-Id: Ide4c2d7d17adabdc8375f14d3676f1d6b8e455f4
This commit is contained in:
Dan Willemsen 2016-09-21 19:53:20 +00:00 committed by android-build-merger
commit a8780902b2

View file

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