commit edeef1f87f8e2c593df74359d29a7929ab8c4776
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Apr 15 20:47:01 2019 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Apr 15 18:48:09 2019 +0000
tree 9da749ff3288687f38f2b2f898ad6b88ff387c15
parent 4a7946db6fe3dd3d49d08ca3c4ed6cb9a0eb4bc7

Add addKeepClassRulesWithAllowObfuscation helper method

Changed addKeepAndMinifyAllClassesRule to
addKeepAllClassesRuleWithAllowObfuscation to have names
align.

Change-Id: I94da73ba616cc6ea2817275be084c12782bfd24d

src/test/java/com/android/tools/r8/TestShrinkerBuilder.java

diff --git a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
index 8079072..8b7dbbb 100644
--- a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
@@ -64,7 +64,7 @@
     return addKeepRules("-keep class ** { *; }");
   }
 
-  public T addKeepAndMinifyAllClassesRule() {
+  public T addKeepAllClassesRuleWithAllowObfuscation() {
     return addKeepRules("-keep,allowobfuscation class ** { *; }");
   }
 
@@ -79,6 +79,13 @@
     return self();
   }
 
+  public T addKeepClassRulesWithAllowObfuscation(Class<?>... classes) {
+    for (Class<?> clazz : classes) {
+      addKeepRules("-keep,allowobfuscation class " + clazz.getTypeName());
+    }
+    return self();
+  }
+
   public T addKeepClassAndMembersRules(Class<?>... classes) {
     for (Class<?> clazz : classes) {
       addKeepRules("-keep class " + clazz.getTypeName() + " { *; }");

src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java b/src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java
index e57c596..5eca4d1 100644
--- a/src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/KeepPackageNamesTest.java
@@ -85,7 +85,7 @@
   public void testProguard() throws Exception {
     testForProguard()
         .addProgramClasses(CLASSES)
-        .addKeepAndMinifyAllClassesRule()
+        .addKeepAllClassesRuleWithAllowObfuscation()
         .addKeepRules(config.getKeepRule())
         .compile()
         .inspect(config::inspect);
@@ -95,7 +95,7 @@
   public void testR8() throws Exception {
     testForR8(Backend.DEX)
         .addProgramClasses(CLASSES)
-        .addKeepAndMinifyAllClassesRule()
+        .addKeepAllClassesRuleWithAllowObfuscation()
         .addKeepRules(config.getKeepRule())
         .compile()
         .inspect(config::inspect);