commit 454ce1e82592f9386c7f84b5fdbfbeab6097c3a5
author clementbera <clementbera@google.com> Mon Oct 07 08:56:21 2019 +0200
committer Clément Béra <clementbera@google.com> Mon Oct 07 06:57:08 2019 +0000
tree 3de0af8bbf3d7abf889abfe116abb39436976795
parent b63d230ac3b1d4c6391d3b0cf53edd731da83130

Re-enable Shrinking in L8

Bug: 139273544
Change-Id: I9131ef402324738e928843d5c0080d57cb161722

src/main/java/com/android/tools/r8/L8Command.java

diff --git a/src/main/java/com/android/tools/r8/L8Command.java b/src/main/java/com/android/tools/r8/L8Command.java
index f3b7e05..656fee1 100644
--- a/src/main/java/com/android/tools/r8/L8Command.java
+++ b/src/main/java/com/android/tools/r8/L8Command.java
@@ -163,15 +163,8 @@
     }
 
     public boolean isShrinking() {
-      // TODO(b/139273544): Re-enable shrinking once fixed.
-      getReporter()
-          .warning(
-              new StringDiagnostic(
-                  "Shrinking of desugared library has been temporarily disabled due to known bugs"
-                      + " being fixed."));
-      return false;
       // Answers true if keep rules, even empty, are provided.
-      // return !proguardConfigStrings.isEmpty() || !proguardConfigFiles.isEmpty();
+       return !proguardConfigStrings.isEmpty() || !proguardConfigFiles.isEmpty();
     }
 
     @Override

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

diff --git a/src/test/java/com/android/tools/r8/L8CommandTest.java b/src/test/java/com/android/tools/r8/L8CommandTest.java
index 97569ab..2370b74 100644
--- a/src/test/java/com/android/tools/r8/L8CommandTest.java
+++ b/src/test/java/com/android/tools/r8/L8CommandTest.java
@@ -125,9 +125,7 @@
                 .build());
   }
 
-  // TODO(b/139273544): Re-enable shrinking once fixed and re-enable tests using shrinking.
   @Test
-  @Ignore
   public void addProguardConfigurationString() throws Throwable {
     String keepRule = "-keep class java.time.*";
     List<String> keepRules = new ArrayList<>();
@@ -143,7 +141,6 @@
   }
 
   @Test
-  @Ignore
   public void addProguardConfigurationFile() throws Throwable {
     String keepRule = "-keep class java.time.*";
     Path keepRuleFile = temp.newFile("keepRuleFile.txt").toPath();