am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '06de9f940c34b8ade1f1866fbc1c6b32f93277b4':
Revert "Collect and store proguard obfuscation dictionary files."
diff --git a/core/Makefile b/core/Makefile
index ab7d107..eb02ff4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1396,24 +1396,6 @@
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 3af4306..282d9c3 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -819,9 +819,6 @@
$(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)