From 4f1b4191d1366897c8150bcde792db2510dd3df2 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Thu, 18 Feb 2010 14:40:53 -0800
Subject: [PATCH] Revert "Enable Proguard."

This reverts commit c237ae8c85d4fffc158b0813cbc5b8bde4d75b67.

Reason: We need more flags for unit tests
---
 Android.mk       |  3 ---
 proguard.flags   | 20 --------------------
 tests/Android.mk |  3 +--
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 proguard.flags

diff --git a/Android.mk b/Android.mk
index 484e62179..794feec44 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,9 +28,6 @@ LOCAL_JAVA_STATIC_LIBRARIES := android-common
 
 LOCAL_PACKAGE_NAME := Email
 
-LOCAL_PROGUARD_ENABLED := full
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
-
 include $(BUILD_PACKAGE)
 
 # additionally, build unit tests in a separate .apk
diff --git a/proguard.flags b/proguard.flags
deleted file mode 100644
index 18eb34ab1..000000000
--- a/proguard.flags
+++ /dev/null
@@ -1,20 +0,0 @@
-# keep names that are used by reflection.
--keep class com.android.email.provider.EmailContent$Account
--keepclasseswithmembers class * {
-  public static void actionEditIncomingSettings(android.app.Activity, com.android.email.provider.EmailContent$Account);
-}
-
--keepclasseswithmembers class * {
-  public static void actionEditOutgoingSettings(android.app.Activity, com.android.email.provider.EmailContent$Account);
-}
-
--keepclasseswithmembers class * {
-  public *** newInstance(android.content.Context, java.lang.String);
-}
-
--keep class com.android.email.mail.Store$PersistentDataCallbacks
--keepclasseswithmembers class * {
-  public *** newInstance(java.lang.String, android.content.Context, com.android.email.mail.Store$PersistentDataCallbacks);
-}
-
--keep class * extends org.apache.james.mime4j.util.TempStorage
diff --git a/tests/Android.mk b/tests/Android.mk
index 9dc368667..c4e7fd425 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -33,6 +33,5 @@ LOCAL_INSTRUMENTATION_FOR := Email
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_PROGUARD_ENABLED := full
-
 include $(BUILD_PACKAGE)
+