Merge "Package up proguard jack_dictionary"

am: f7d1a6d75f

Change-Id: Ia426e7d0fea6d0c6fc610d9d9fed20c9d2159ed6
This commit is contained in:
Dan Willemsen 2016-09-21 19:48:20 +00:00 committed by android-build-merger
commit e875b39791
1 changed files with 1 additions and 1 deletions

View File

@ -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; \