Reland "Clean up main dex list consumers"
This reverts commit cc9c19543cce0884a2a46b62168961b23918e5d3.
Change-Id: I4131b9ae1b5bf26b41da3a0eb8cfb5f2bc426618
diff --git a/src/main/java/com/android/tools/r8/GenerateMainDexList.java b/src/main/java/com/android/tools/r8/GenerateMainDexList.java
index 07783b3..2a794ab 100644
--- a/src/main/java/com/android/tools/r8/GenerateMainDexList.java
+++ b/src/main/java/com/android/tools/r8/GenerateMainDexList.java
@@ -5,6 +5,7 @@
import static com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException;
+import com.android.tools.r8.StringConsumer.ForwardingConsumer;
import com.android.tools.r8.dex.ApplicationReader;
import com.android.tools.r8.experimental.graphinfo.GraphConsumer;
import com.android.tools.r8.graph.AppInfoWithClassHierarchy;
@@ -21,14 +22,13 @@
import com.android.tools.r8.shaking.RootSetUtils.MainDexRootSet;
import com.android.tools.r8.shaking.WhyAreYouKeepingConsumer;
import com.android.tools.r8.utils.AndroidApp;
-import com.android.tools.r8.utils.Box;
import com.android.tools.r8.utils.ExceptionUtils;
import com.android.tools.r8.utils.InternalOptions;
+import com.android.tools.r8.utils.SortingStringConsumer;
import com.android.tools.r8.utils.ThreadUtils;
import com.android.tools.r8.utils.Timing;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
@@ -42,21 +42,13 @@
this.options = options;
}
- private List<String> run(AndroidApp app, ExecutorService executor)
+ private void run(AndroidApp app, ExecutorService executor, SortingStringConsumer consumer)
throws IOException {
try {
- // TODO(b/178231294): Clean up this such that we do not both return the result and call the
- // consumer.
DexApplication application = new ApplicationReader(app, options, timing).read(executor);
- List<String> result = new ArrayList<>();
traceMainDex(executor, application, MainDexInfo.none())
- .forEach(type -> result.add(type.toBinaryName() + ".class"));
- Collections.sort(result);
- if (options.mainDexListConsumer != null) {
- options.mainDexListConsumer.accept(String.join("\n", result), options.reporter);
- options.mainDexListConsumer.finished(options.reporter);
- }
- return result;
+ .forEach(type -> consumer.accept(type.toBinaryName() + ".class", options.reporter));
+ consumer.finished(options.reporter);
} catch (ExecutionException e) {
throw unwrapExecutionException(e);
}
@@ -137,11 +129,11 @@
/**
* Main API entry for computing the main-dex list.
*
- * The main-dex list is represented as a list of strings, each string specifies one class to
+ * <p>The main-dex list is represented as a list of strings, each string specifies one class to
* keep in the primary dex file (<code>classes.dex</code>).
*
- * A class is specified using the following format: "com/example/MyClass.class". That is
- * "/" as separator between package components, and a trailing ".class".
+ * <p>A class is specified using the following format: "com/example/MyClass.class". That is "/" as
+ * separator between package components, and a trailing ".class".
*
* @param command main dex-list generator command.
* @param executor executor service from which to get threads for multi-threaded processing.
@@ -151,17 +143,28 @@
throws CompilationFailedException {
AndroidApp app = command.getInputApp();
InternalOptions options = command.getInternalOptions();
- Box<List<String>> result = new Box<>();
+ List<String> result = new ArrayList<>();
ExceptionUtils.withMainDexListHandler(
command.getReporter(),
() -> {
try {
- result.set(new GenerateMainDexList(options).run(app, executor));
+ new GenerateMainDexList(options)
+ .run(
+ app,
+ executor,
+ new SortingStringConsumer(
+ new ForwardingConsumer(options.mainDexListConsumer) {
+ @Override
+ public void accept(String string, DiagnosticsHandler handler) {
+ result.add(string);
+ super.accept(string, handler);
+ }
+ }));
} finally {
executor.shutdown();
}
});
- return result.get();
+ return result;
}
public static void main(String[] args) throws CompilationFailedException {
diff --git a/src/main/java/com/android/tools/r8/GenerateMainDexListCommand.java b/src/main/java/com/android/tools/r8/GenerateMainDexListCommand.java
index b08a738..85bc305 100644
--- a/src/main/java/com/android/tools/r8/GenerateMainDexListCommand.java
+++ b/src/main/java/com/android/tools/r8/GenerateMainDexListCommand.java
@@ -14,6 +14,7 @@
import com.android.tools.r8.shaking.ProguardConfigurationSourceStrings;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.InternalOptions;
+import com.android.tools.r8.utils.JoiningStringConsumer;
import com.android.tools.r8.utils.Reporter;
import com.android.tools.r8.utils.StringDiagnostic;
import com.google.common.collect.ImmutableList;
@@ -115,7 +116,7 @@
factory,
getAppBuilder().build(),
mainDexKeepRules,
- mainDexListConsumer,
+ new JoiningStringConsumer(mainDexListConsumer, "\n"),
mainDexKeptGraphConsumer,
getReporter());
}
diff --git a/src/main/java/com/android/tools/r8/utils/JoiningStringConsumer.java b/src/main/java/com/android/tools/r8/utils/JoiningStringConsumer.java
new file mode 100644
index 0000000..48a1e90
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/utils/JoiningStringConsumer.java
@@ -0,0 +1,44 @@
+// Copyright (c) 2021, 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.
+
+package com.android.tools.r8.utils;
+
+import com.android.tools.r8.DiagnosticsHandler;
+import com.android.tools.r8.StringConsumer;
+import com.android.tools.r8.StringConsumer.ForwardingConsumer;
+
+/* Joining String Consumer to join strings that it accepts. */
+public class JoiningStringConsumer extends ForwardingConsumer {
+
+ private final String separator;
+ private final StringConsumer consumer;
+ private final StringBuilder builder = new StringBuilder();
+
+ /**
+ * @param consumer Consumer to forward to the joined input to. If null, nothing will be forwarded.
+ */
+ public JoiningStringConsumer(StringConsumer consumer, String separator) {
+ super(consumer);
+ this.consumer = consumer;
+ this.separator = separator;
+ }
+
+ @Override
+ public void accept(String string, DiagnosticsHandler handler) {
+ if (builder.length() > 0) {
+ builder.append(separator);
+ }
+ builder.append(string);
+ }
+
+ @Override
+ public void finished(DiagnosticsHandler handler) {
+ super.accept(builder.toString(), handler);
+ super.finished(handler);
+ }
+
+ public StringConsumer getConsumer() {
+ return consumer;
+ }
+}
diff --git a/src/main/java/com/android/tools/r8/utils/SortingStringConsumer.java b/src/main/java/com/android/tools/r8/utils/SortingStringConsumer.java
new file mode 100644
index 0000000..8c65b00
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/utils/SortingStringConsumer.java
@@ -0,0 +1,38 @@
+// Copyright (c) 2021, 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.
+
+package com.android.tools.r8.utils;
+
+import com.android.tools.r8.DiagnosticsHandler;
+import com.android.tools.r8.StringConsumer;
+import com.android.tools.r8.StringConsumer.ForwardingConsumer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/** Sorting consumer that accepts all input and then sorts it when calling finished */
+public class SortingStringConsumer extends ForwardingConsumer {
+
+ private final List<String> accepted = new ArrayList<>();
+
+ /**
+ * @param consumer Consumer to forward to the sorted consumed input to. If null, nothing will be
+ * forwarded.
+ */
+ public SortingStringConsumer(StringConsumer consumer) {
+ super(consumer);
+ }
+
+ @Override
+ public void accept(String string, DiagnosticsHandler handler) {
+ this.accepted.add(string);
+ }
+
+ @Override
+ public void finished(DiagnosticsHandler handler) {
+ Collections.sort(accepted);
+ accepted.forEach(string -> super.accept(string, handler));
+ super.finished(handler);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/utils/GenerateMainDexListCommandTest.java b/src/test/java/com/android/tools/r8/utils/GenerateMainDexListCommandTest.java
index c35bbf2..f681673 100644
--- a/src/test/java/com/android/tools/r8/utils/GenerateMainDexListCommandTest.java
+++ b/src/test/java/com/android/tools/r8/utils/GenerateMainDexListCommandTest.java
@@ -42,6 +42,9 @@
private Path getOutputPath(GenerateMainDexListCommand command) {
StringConsumer consumer = command.getMainDexListConsumer();
+ if (consumer instanceof JoiningStringConsumer) {
+ consumer = ((JoiningStringConsumer) consumer).getConsumer();
+ }
if (consumer instanceof StringConsumer.FileConsumer) {
return ((StringConsumer.FileConsumer) consumer).getOutputPath();
}
