am aa87a11d: am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev

* commit 'aa87a11dffec0ea58c93ab0dd23b067975a4c681':
  Collect and store proguard obfuscation dictionary files.
This commit is contained in:
Ying Wang 2013-08-23 10:09:28 -07:00 committed by Android Git Automerger
commit 93b95dc4b9
2 changed files with 21 additions and 0 deletions

View File

@ -1396,6 +1396,24 @@ $(EMMA_META_ZIP) :
endif # EMMA_INSTRUMENT=true
#------------------------------------------------------------------
# A zip of Proguard obfuscation dictionary files.
# Only for apps_only build.
#
ifdef TARGET_BUILD_APPS
PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/proguard-dict-$(FILE_NAME_TAG).zip
# the dependency will be set up later in build/core/main.mk.
$(PROGUARD_DICT_ZIP) :
@echo "Packaging proguard obfuscation dictionary files."
$(hide) dict_files="$(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/*/proguard_dictionary"; \
if [ -n "$$dict_files" ]; then \
zip $@ $$dict_files; \
else \
touch $@; \
fi
endif # TARGET_BUILD_APPS
# -----------------------------------------------------------------
# dalvik something
.PHONY: dalvikfiles

View File

@ -819,6 +819,9 @@ ifneq ($(TARGET_BUILD_APPS),)
$(call dist-for-goals,apps_only, $(EMMA_META_ZIP))
endif
$(PROGUARD_DICT_ZIP) : $(apps_only_installed_files)
$(call dist-for-goals,apps_only, $(PROGUARD_DICT_ZIP))
.PHONY: apps_only
apps_only: $(unbundled_build_modules)