commit 747a7b6daa3e426cde23134411b8c19722e0914c
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Apr 25 08:20:32 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Apr 25 06:21:01 2023 +0000
tree d0cdb41eb7f5290e578cd2ac9bd3111651219a19
parent 306086c01c86f32795d94c0e721823c613c57777

[Retrace] Fix AndroidAppConsumers to not automatically create a consumer

Change-Id: I30208411f06e7d617ca67e148bc01e37fe1a7151

src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java

diff --git a/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java b/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java
index f010dd8..8142f7b 100644
--- a/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java
+++ b/src/main/java/com/android/tools/r8/utils/AndroidAppConsumers.java
@@ -71,30 +71,32 @@
 
   public MapConsumer wrapProguardMapConsumer(MapConsumer consumer) {
     assert mapConsumer == null;
-    mapConsumer =
-        wrapExistingMapConsumer(
-            consumer,
-            ProguardMapStringConsumer.builder()
-                .setStringConsumer(
-                    new StringConsumer() {
-                      StringBuilder stringBuilder = null;
+    if (consumer != null) {
+      mapConsumer =
+          wrapExistingMapConsumer(
+              consumer,
+              ProguardMapStringConsumer.builder()
+                  .setStringConsumer(
+                      new StringConsumer() {
+                        StringBuilder stringBuilder = null;
 
-                      @Override
-                      public void accept(String string, DiagnosticsHandler handler) {
-                        if (stringBuilder == null) {
-                          stringBuilder = new StringBuilder();
+                        @Override
+                        public void accept(String string, DiagnosticsHandler handler) {
+                          if (stringBuilder == null) {
+                            stringBuilder = new StringBuilder();
+                          }
+                          stringBuilder.append(string);
                         }
-                        stringBuilder.append(string);
-                      }
 
-                      @Override
-                      public void finished(DiagnosticsHandler handler) {
-                        if (stringBuilder != null) {
-                          builder.setProguardMapOutputData(stringBuilder.toString());
+                        @Override
+                        public void finished(DiagnosticsHandler handler) {
+                          if (stringBuilder != null) {
+                            builder.setProguardMapOutputData(stringBuilder.toString());
+                          }
                         }
-                      }
-                    })
-                .build());
+                      })
+                  .build());
+    }
     return mapConsumer;
   }