Revert "Enable Proguard."
This reverts commit c237ae8c85d4fffc158b0813cbc5b8bde4d75b67.
Reason: We need more flags for unit tests
diff --git a/Android.mk b/Android.mk
index 484e621..794feec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,9 +28,6 @@
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 18eb34a..0000000
--- 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 9dc3686..c4e7fd4 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -33,6 +33,5 @@
LOCAL_SDK_VERSION := current
-LOCAL_PROGUARD_ENABLED := full
-
include $(BUILD_PACKAGE)
+
