From df8b48449a0a607249d05aa420e41d0b3470ed63 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 23 Aug 2013 17:11:18 +0000
Subject: [PATCH] Revert "Collect and store proguard obfuscation dictionary
 files."

This reverts commit 41dbe1e535c1aea9a4c4cec6be637fe1b882220b.

Change-Id: I023594779128083b75a069fd860cd29dd7951ef5
---
 core/Makefile | 18 ------------------
 core/main.mk  |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 43dcf5181d..55ab6a512d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1391,24 +1391,6 @@ $(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
diff --git a/core/main.mk b/core/main.mk
index 3af4306298..282d9c3f21 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -819,9 +819,6 @@ 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)