diff options
| author | Yohann Roussel <yroussel@google.com> | 2017-06-01 09:23:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-01 09:23:16 +0000 |
| commit | 64c9ca5a1cdf4ffdfa5eb2e70d7844c756687323 (patch) | |
| tree | 72a49c66fb7bf40164177ca6e3779115a50b3ee1 | |
| parent | 4a3fa67c4978a7dc3c5a9475ae553a366f13fe03 (diff) | |
| parent | 19c0e1011c260da8c6de1f6b104f77794dd09e40 (diff) | |
| download | dalvik-64c9ca5a1cdf4ffdfa5eb2e70d7844c756687323.tar.gz | |
Merge "Keep InstrumentationTestCase in main dex"android-o-preview-3
| -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 af4085ae5..1fe2eb1c9 100644 --- a/dx/etc/mainDexClasses.rules +++ b/dx/etc/mainDexClasses.rules @@ -25,3 +25,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 { +} |