am 85418952: am b6cf5b2f: am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev

* commit '8541895267c385656e31dca78848091a4720661d':
  Collect and store proguard obfuscation dictionary files.
This commit is contained in:
Ying Wang 2013-08-26 15:17:25 -07:00 committed by Android Git Automerger
commit b5101e3242
2 changed files with 21 additions and 0 deletions

View file

@ -1422,6 +1422,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=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \
if [ -n "$$dict_files" ]; then \
zip -q $@ $$dict_files; \
else \
touch $@; \
fi
endif # TARGET_BUILD_APPS
# -----------------------------------------------------------------
# dalvik something
.PHONY: dalvikfiles

View file

@ -828,6 +828,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)