commit c14b76a3b89d4292ed3bccda5da7a6d0bc0e9a41
author Rico Wind <ricow@google.com> Thu Sep 30 13:25:01 2021 +0200
committer Rico Wind <ricow@google.com> Thu Sep 30 11:59:27 2021 +0000
tree 380ecd35df740796f50da89df0587110a9e9af36
parent 00548002b5db3651581665a2f9e1c8ce9d1c3d79

Remove unused fields in R8Command

Change-Id: If541451dc84a800cc326e4a618c0bedbaf6b3f7d

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

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index e7efbfa..fdf35d6 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -47,7 +47,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -109,12 +108,10 @@
     private StringConsumer proguardConfigurationConsumer = null;
     private GraphConsumer keptGraphConsumer = null;
     private GraphConsumer mainDexKeptGraphConsumer = null;
-    private BiFunction<String, Long, Boolean> dexClassChecksumFilter = (name, checksum) -> true;
     private final List<FeatureSplit> featureSplits = new ArrayList<>();
     private String synthesizedClassPrefix = "";
     private boolean skipDump = false;
 
-    private boolean allowPartiallyImplementedProguardOptions = false;
     private boolean allowTestProguardOptions =
         System.getProperty("com.android.tools.r8.allowTestProguardOptions") != null;
 
@@ -614,11 +611,6 @@
 
     }
 
-    // Internal for-testing method to add post-processors of the proguard configuration.
-    void allowPartiallyImplementedProguardOptions() {
-      allowPartiallyImplementedProguardOptions = true;
-    }
-
     // Internal for-testing method to allow proguard options only available for testing.
     void allowTestProguardOptions() {
       allowTestProguardOptions = true;

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

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index be6c8f0..e7fc647 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -2127,12 +2127,6 @@
     return builder;
   }
 
-  public static R8Command.Builder allowPartiallyImplementedProguardOptions(
-      R8Command.Builder builder) {
-    builder.allowPartiallyImplementedProguardOptions();
-    return builder;
-  }
-
   public static R8Command.Builder allowTestProguardOptions(R8Command.Builder builder) {
     builder.allowTestProguardOptions();
     return builder;

src/test/java/com/android/tools/r8/internal/CompilationTestBase.java

diff --git a/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java b/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
index 83a8577..cec9053 100644
--- a/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
+++ b/src/test/java/com/android/tools/r8/internal/CompilationTestBase.java
@@ -154,7 +154,6 @@
       builder.setMode(mode);
       builder.setProgramConsumer(dexIndexedConsumerSupplier.get());
       builder.setMinApiLevel(AndroidApiLevel.L.getLevel());
-      ToolHelper.allowPartiallyImplementedProguardOptions(builder);
       ToolHelper.addProguardConfigurationConsumer(
           builder,
           pgConfig -> {