Ignore -overloadaggressively This Proguard option is already the default R8 behavior. Bug: 62478438 Change-Id: I313629fb4ad5406676caf3a53c51e559623f656f
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 860fc45..4062853 100644 --- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java +++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -48,6 +48,7 @@ "filterlibraryjarswithorginalprogramjars", "dontskipnonpubliclibraryclasses", "dontskipnonpubliclibraryclassmembers", + "overloadaggressively", "invokebasemethod"); private static final List<String> ignoredClassDescriptorOptions = ImmutableList .of("isclassnamestring",
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 52bbda6..0e837bf 100644 --- a/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java +++ b/src/test/java/com/android/tools/r8/shaking/ProguardConfigurationParserTest.java
@@ -62,6 +62,8 @@ VALID_PROGUARD_DIR + "dontskipnonpubliclibraryclasses.flags"; private static final String DONT_SKIP_NON_PUBLIC_LIBRARY_CLASS_MEMBERS = VALID_PROGUARD_DIR + "dontskipnonpubliclibraryclassmembers.flags"; + private static final String OVERLOAD_AGGRESIVELY = + VALID_PROGUARD_DIR + "overloadaggressively.flags"; private static final String DONT_OPTIMIZE = VALID_PROGUARD_DIR + "dontoptimize.flags"; private static final String SKIP_NON_PUBLIC_LIBRARY_CLASSES = @@ -339,6 +341,13 @@ } @Test + public void parseOverloadAggressively() + throws IOException, ProguardRuleParserException { + ProguardConfigurationParser parser = new ProguardConfigurationParser(new DexItemFactory()); + parser.parse(Paths.get(OVERLOAD_AGGRESIVELY)); + } + + @Test public void parseDontOptimize() throws IOException, ProguardRuleParserException { ProguardConfigurationParser parser = new ProguardConfigurationParser(new DexItemFactory());
diff --git a/src/test/proguard/valid/overloadaggressively.flags b/src/test/proguard/valid/overloadaggressively.flags new file mode 100644 index 0000000..312ebff --- /dev/null +++ b/src/test/proguard/valid/overloadaggressively.flags
@@ -0,0 +1,5 @@ +# Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file +# for details. All rights reserved. Use of this source code is governed by a +# BSD-style license that can be found in the LICENSE file. + +-overloadaggressively