diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-05 07:29:56 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-05 07:29:56 +0000 |
| commit | 5d27f9ee67f56b4e891b30c06110e08af5a40925 (patch) | |
| tree | c7a46006e27031db4b9ccf75616db1f12f5df225 | |
| parent | 70accbadf3390cd38fdd063c0d45c1a5916e7f6b (diff) | |
| parent | 5ca065805456ff3d546b1f44ac4d4c3cefa3df9e (diff) | |
| download | dalvik-oreo-dr2-release.tar.gz | |
release-request-a2143a0f-bf92-4fa8-ad68-7346e7505126-for-git_oc-dr1-release-4067638 snap-temp-L84900000070511178android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release
Change-Id: Ib932b6a4ba04823d46d83eea891ef42a36d55f19
| -rw-r--r-- | dx/etc/mainDexClasses.rules | 5 | ||||
| -rw-r--r-- | dx/shrinkedAndroid.proguard.flags | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/dx/etc/mainDexClasses.rules b/dx/etc/mainDexClasses.rules index a1ca9318f..0cd384244 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 d72bb18a3..c22ec926c 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 { +} |