Merge "Snap for 4455664 from dd2c0538809551f60d457c5884bd1f5c8ded8cf7 to oreo-vts-release" into oreo-vts-release
diff --git a/dx/etc/mainDexClasses.rules b/dx/etc/mainDexClasses.rules
index 0cd3842..a1ca931 100644
--- a/dx/etc/mainDexClasses.rules
+++ b/dx/etc/mainDexClasses.rules
@@ -13,8 +13,3 @@
-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 c22ec92..d72bb18 100644
--- a/dx/shrinkedAndroid.proguard.flags
+++ b/dx/shrinkedAndroid.proguard.flags
@@ -19,6 +19,4 @@
}
-keep public class java.lang.annotation.Annotation {
}
--keep public class * extends android.test.InstrumentationTestCase {
-}