am 58ad7061: am 93b95dc4: am aa87a11d: am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '58ad70618d4d21f16ffe89c1e0eea7e35eae918b':
Collect and store proguard obfuscation dictionary files.
diff --git a/core/Makefile b/core/Makefile
index 41fcc6c..ac00943 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1422,6 +1422,24 @@
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
diff --git a/core/main.mk b/core/main.mk
index 5522867..b8a8191 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -828,6 +828,9 @@
$(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)