Merge "Fix parsing of -dontwarn flag."

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 2411676..946230f 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -210,6 +210,7 @@
       } else if (acceptString("ignorewarnings")) {
         configurationBuilder.setIgnoreWarnings(true);
       } else if (acceptString("dontwarn")) {
+        skipWhitespace();
         if (isOptionalArgumentGiven()) {
           configurationBuilder.addDontWarnPattern(parseClassNames());
         } else {

src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java b/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java
index d119423..0ebc43c 100644
--- a/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java
@@ -208,7 +208,8 @@
     ProguardConfigurationParser parser =
         new ProguardConfigurationParser(dexItemFactory, diagnosticsHandler);
     String dontwarnAll = "-dontwarn";
-    parser.parse(createConfigurationForTesting(ImmutableList.of(dontwarnAll)));
+    String otherOption = "-keep class *";
+    parser.parse(createConfigurationForTesting(ImmutableList.of(dontwarnAll, otherOption)));
     ProguardConfiguration config = parser.getConfig();
     assertTrue(
         config.getDontWarnPatterns().matches(dexItemFactory.createType("Lboobaz;")));