commit 4ce302e8d47316b438aa0586261fa513a956f2cf
author Jinseong Jeon <jsjeon@google.com> Mon Oct 02 20:21:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 02 20:21:18 2017 +0000
tree ec85f48a46f1c77137f1865e3fa0b9d084c9c050
parent 586e1bbb7f5c4fd8ef4211573f8707047be41ea8
parent 23aa391aca6e2de31805e8c064ccd61a328b0486

Merge "Remove a warning for renamesourcefileattribute."

src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java

diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
index 9b68e10..4784387 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -151,8 +151,6 @@
         } else {
           configurationBuilder.setRenameSourceFileAttribute("");
         }
-        // TODO(b/36799675): warn until it is fully implemented.
-        warnIgnoringOptions("renamesourcefileattribute");
       } else if (acceptString("keepattributes")) {
         parseKeepAttributes();
       } else if (acceptString("keeppackagenames")) {

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 1080f11..90597ca 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -253,7 +253,7 @@
 
     public static KeepAttributeOptions filterOnlySignatures() {
       KeepAttributeOptions result = new KeepAttributeOptions();
-      result.applyPatterns(ImmutableList.of("*"));
+      result.applyPatterns(KEEP_ALL);
       result.signature = false;
       return result;
     }