commit bd7abfa1cd9748124421616f8f53ef3f584858d4
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Nov 17 00:33:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 17 00:33:56 2017 +0000
tree a824e78fb37c91a13dc07600c4ce0ead1629bbd7
parent ccf295b73d3368bd0027df19ae0a26f2e1f0f8f9
parent 13e3d97a4b8d451b5804313179eb59992639c356

Merge "Snap for 4455664 from dd2c0538809551f60d457c5884bd1f5c8ded8cf7 to oreo-vts-release" into oreo-vts-release

dx/etc/mainDexClasses.rules

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>();

-  }

-

dx/shrinkedAndroid.proguard.flags

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 {
-}