release-request-4c58f975-7a8c-4f23-922b-75d1a4fcf38a-for-git_oc-vts-release-4287305 snap-temp-L67300000095126797
Change-Id: Ic2d43b45b0b0d3cd4f9bce2b7320c411e3f6dfb3
diff --git a/dx/etc/mainDexClasses.rules b/dx/etc/mainDexClasses.rules
index a1ca931..0cd3842 100644
--- a/dx/etc/mainDexClasses.rules
+++ b/dx/etc/mainDexClasses.rules
@@ -13,3 +13,8 @@
-keep public class * extends java.lang.annotation.Annotation {
*;
}
+# Keep old fashion tests in the main dex or they'll be silently ignored by InstrumentationTestRunner
+ -keep public class * extends android.test.InstrumentationTestCase {
+ <init>();
+ }
+
diff --git a/dx/shrinkedAndroid.proguard.flags b/dx/shrinkedAndroid.proguard.flags
index d72bb18..c22ec92 100644
--- a/dx/shrinkedAndroid.proguard.flags
+++ b/dx/shrinkedAndroid.proguard.flags
@@ -19,4 +19,6 @@
}
-keep public class java.lang.annotation.Annotation {
}
+-keep public class * extends android.test.InstrumentationTestCase {
+}
