commit 5d27f9ee67f56b4e891b30c06110e08af5a40925
author android-build-team Robot <android-build-team-robot@google.com> Mon Jun 05 07:29:56 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jun 05 07:29:56 2017 +0000
tree c7a46006e27031db4b9ccf75616db1f12f5df225
parent 70accbadf3390cd38fdd063c0d45c1a5916e7f6b
parent 5ca065805456ff3d546b1f44ac4d4c3cefa3df9e

release-request-a2143a0f-bf92-4fa8-ad68-7346e7505126-for-git_oc-dr1-release-4067638 snap-temp-L84900000070511178

Change-Id: Ib932b6a4ba04823d46d83eea891ef42a36d55f19

dx/etc/mainDexClasses.rules

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

+  }

+

dx/shrinkedAndroid.proguard.flags

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