Remove unused noDefaultProguardMapConsumer
Change-Id: I333c4db061df9ea79d0cf3e1ff39d9810c627ead
diff --git a/src/test/java/com/android/tools/r8/R8TestBuilder.java b/src/test/java/com/android/tools/r8/R8TestBuilder.java
index 55e0435..7f5b220 100644
--- a/src/test/java/com/android/tools/r8/R8TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/R8TestBuilder.java
@@ -74,14 +74,12 @@
private boolean allowUnusedProguardConfigurationRules = false;
private boolean enableMissingLibraryApiModeling = true;
private CollectingGraphConsumer graphConsumer = null;
- private List<ExternalArtProfile> residualArtProfiles = new ArrayList<>();
- private List<String> keepRules = new ArrayList<>();
- private List<Path> mainDexRulesFiles = new ArrayList<>();
- private List<String> applyMappingMaps = new ArrayList<>();
+ private final List<ExternalArtProfile> residualArtProfiles = new ArrayList<>();
+ private final List<String> keepRules = new ArrayList<>();
+ private final List<Path> mainDexRulesFiles = new ArrayList<>();
+ private final List<String> applyMappingMaps = new ArrayList<>();
private final List<Path> features = new ArrayList<>();
- private boolean createDefaultProguardMapConsumer = true;
-
@Override
public boolean isR8TestBuilder() {
return true;
@@ -110,20 +108,18 @@
builder.setDisableMinification(true);
}
StringBuilder proguardMapBuilder = new StringBuilder();
- if (createDefaultProguardMapConsumer) {
- builder.setProguardMapConsumer(
- new StringConsumer() {
- @Override
- public void accept(String string, DiagnosticsHandler handler) {
- proguardMapBuilder.append(string);
- }
+ builder.setProguardMapConsumer(
+ new StringConsumer() {
+ @Override
+ public void accept(String string, DiagnosticsHandler handler) {
+ proguardMapBuilder.append(string);
+ }
- @Override
- public void finished(DiagnosticsHandler handler) {
- // Nothing to do.
- }
- });
- }
+ @Override
+ public void finished(DiagnosticsHandler handler) {
+ // Nothing to do.
+ }
+ });
if (!applyMappingMaps.isEmpty()) {
try {
@@ -162,7 +158,7 @@
app.get(),
box.proguardConfiguration,
box.syntheticProguardRules,
- createDefaultProguardMapConsumer ? proguardMapBuilder.toString() : null,
+ proguardMapBuilder.toString(),
graphConsumer,
getMinApiLevel(),
features,
@@ -803,11 +799,6 @@
return self();
}
- public T noDefaultProguardMapConsumer() {
- createDefaultProguardMapConsumer = false;
- return self();
- }
-
public T addArtProfileForRewriting(ArtProfileProvider artProfileProvider) {
return addArtProfileForRewriting(
artProfileProvider,
