Fix NoClassDefFound in tests with proguard-test.flags

Explicitely keep classes used for tests in `proguard-test.flags`
applied when the target is eng.

Bug: 17388964 Fix the Gmail test suite
Change-Id: I91b38ac7c8e07aeb9006d2587dd25852dc937147

3 files changed, 41 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 53c7cb27b..d00c9c179 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,6 +53,9 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.appcompat:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+ifeq (eng,$(TARGET_BUILD_VARIANT))
+  LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
+endif
 
 LOCAL_EMMA_COVERAGE_FILTER := +com.android.mail.*, +com.android.emailcommon.*, +com.google.android.mail.*
 
diff --git a/proguard-test.flags b/proguard-test.flags
new file mode 100644
index 000000000..2eb8cfa59
--- /dev/null
+++ b/proguard-test.flags
@@ -0,0 +1,38 @@
+# These flags are in addition to the one in proguard.flags, which is included by the build
+# directives in Android.mk.
+
+-keep class ** {
+  *** *ForTest(...);
+}
+
+-keep class com.android.emailcommon.internet.MimeBodyPart
+-keep class com.android.emailcommon.internet.MimeMessage {
+  <init>(...);
+  *** set*(...);
+  *** get*(...);
+}
+-keep class com.android.emailcommon.internet.MimeMultipart
+-keep class com.android.emailcommon.internet.MimeUtility {
+  public static java.lang.String foldAndEncode(java.lang.String);
+}
+-keep class com.android.emailcommon.mail.PackedString {
+  <init>(...);
+}
+-keep class com.android.emailcommon.mail.PackedString$Builder {
+  public <init>(...);
+  public void put(java.lang.String, java.lang.String);
+  public java.lang.String get(java.lang.String);
+}
+-keep class com.android.emailcommon.utility.ConversionUtilities
+
+-keep class com.android.email.LegacyConversions {
+  public static boolean updateMessageFields(...);
+}
+
+-keep class com.android.mail.utils.Utils {
+  public static android.text.Spanned insertStringWithStyle(...);
+}
+
+-keepclasseswithmembers class * {
+  *** findProviderForDomain(...);
+}
diff --git a/proguard.flags b/proguard.flags
index 7267eabb8..f88d37fce 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -28,4 +28,3 @@
 -keepclasseswithmembers class * extends com.android.mail.ui.ConversationSpecialItemView {
   *** setAnimatedHeight(...);
 }
-