commit 7247517a2d501a3625273c383804d8309b7b2ab1
author Ian Zerny <zerny@google.com> Tue Sep 18 05:52:00 2018 +0200
committer Ian Zerny <zerny@google.com> Tue Sep 18 05:52:00 2018 +0200
tree f45353d1691fe5622685c8f6f5765df96dddf439
parent aebbe0ec15ab38a62ebee0c8c7900e47a4da909f

Introduce MainDexOverflowDiagnostic.

This CL also moves specialized messages to custom D8/R8 diagnostics handlers.

Change-Id: I2639df8aa30cdd2fb5880a30b864d812c791f66e

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 c53f367..0970a0c 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -4,6 +4,7 @@
 package com.android.tools.r8;
 
 import com.android.tools.r8.ProgramResource.Kind;
+import com.android.tools.r8.errors.DexFileOverflowDiagnostic;
 import com.android.tools.r8.graph.DexItemFactory;
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.origin.PathOrigin;
@@ -16,6 +17,7 @@
 import com.android.tools.r8.shaking.ProguardConfigurationSourceFile;
 import com.android.tools.r8.shaking.ProguardConfigurationSourceStrings;
 import com.android.tools.r8.utils.AndroidApp;
+import com.android.tools.r8.utils.DefaultDiagnosticsHandler;
 import com.android.tools.r8.utils.ExceptionDiagnostic;
 import com.android.tools.r8.utils.FileUtils;
 import com.android.tools.r8.utils.InternalOptions;
@@ -56,6 +58,24 @@
   @Keep
   public static class Builder extends BaseCompilerCommand.Builder<R8Command, Builder> {
 
+    private static class DefaultR8DiagnosticsHandler extends DefaultDiagnosticsHandler {
+
+      @Override
+      public void error(Diagnostic error) {
+        if (error instanceof DexFileOverflowDiagnostic) {
+          DexFileOverflowDiagnostic overflowDiagnostic = (DexFileOverflowDiagnostic) error;
+          if (!overflowDiagnostic.hasMainDexSpecification()) {
+            super.error(
+                new StringDiagnostic(
+                    overflowDiagnostic.getDiagnosticMessage()
+                        + ". Try supplying a main-dex list or main-dex rules"));
+            return;
+          }
+        }
+        super.error(error);
+      }
+    }
+
     private final List<ProguardConfigurationSource> mainDexRules = new ArrayList<>();
     private Consumer<ProguardConfiguration.Builder> proguardConfigurationConsumer = null;
     private final List<ProguardConfigurationSource> proguardConfigs = new ArrayList<>();
@@ -74,7 +94,9 @@
     private StringConsumer mainDexListConsumer = null;
 
     // TODO(zerny): Consider refactoring CompatProguardCommandBuilder to avoid subclassing.
-    Builder() {}
+    Builder() {
+      this(new DefaultR8DiagnosticsHandler());
+    }
 
     Builder(DiagnosticsHandler diagnosticsHandler) {
       super(diagnosticsHandler);