commit d69d8f8da86fe9e4261aab1b3b459c003097e96a
author Ian Zerny <zerny@google.com> Thu Sep 29 19:45:29 2022 +0200
committer Ian Zerny <zerny@google.com> Tue Oct 11 06:48:51 2022 +0000
tree 5deee60dd09694f5c40d27114697c4377a6180e4
parent 1c6f93fa1544869d47665262818793db7e4902c0

Remove unneeded testing flag for unused keep rules.

Bug: b/143432055
Change-Id: Id2aacfa8a1e31dd0165e3caf2c7d46a4bf1b7581

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

diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index 9360393..3b46564 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -1884,7 +1884,7 @@
             continue;
           }
         }
-        if (!rule.isUsed() && options.testing.reportUnusedProguardConfigurationRules) {
+        if (!rule.isUsed()) {
           options.reporter.info(new UnusedProguardKeepRuleDiagnostic(rule));
         }
       }

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 ebd5a13..68c055f 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1991,7 +1991,6 @@
     public boolean allowInvokeErrors = false;
     public boolean allowUnnecessaryDontWarnWildcards = true;
     public boolean allowUnusedDontWarnRules = true;
-    public boolean reportUnusedProguardConfigurationRules = true;
     public boolean alwaysUseExistingAccessInfoCollectionsInMemberRebinding = true;
     public boolean alwaysUsePessimisticRegisterAllocation = false;
     public boolean enableCheckCastAndInstanceOfRemoval = true;

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

diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index cd6df4f..68b6fc0 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -55,7 +55,6 @@
         options.testing.enableTestAssertions = true;
         options.testing.allowUnusedDontWarnRules = false;
         options.testing.allowUnnecessaryDontWarnWildcards = false;
-        options.testing.reportUnusedProguardConfigurationRules = true;
         options.horizontalClassMergerOptions().enable();
         options.horizontalClassMergerOptions().setEnableInterfaceMerging();
         options