Merge "Display output error in the exception's toString.." into tools_r8tools_r8

2 files changed, 30 insertions, 0 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java
index 37ab58184..63a7a6946 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java
@@ -44,4 +44,29 @@ class ExecResultException extends Exception {
     public int getErrorCode() {
         return mErrorCode;
     }
+
+    public String getLabel() {
+        return "Command-line";
+    }
+
+    @Override
+    public String toString() {
+        String result = String.format("%1$s Error %2$d", getLabel(), mErrorCode);
+        if (mOutput != null && mOutput.length > 0) {
+            // Note : the "error detail" window in Eclipse seem to ignore the \n,
+            // so we prefix them with a space. It's not optimal but it's slightly readable.
+            result += " \nOutput:";
+            for (String o : mOutput) {
+                if (o != null) {
+                    result += " \n" + o;
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public String getMessage() {
+        return toString();
+    }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java
index bfc7e8b79..54246b337 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java
@@ -26,4 +26,9 @@ public final class ProguardResultException extends ExecResultException {
     ProguardResultException(int errorCode, String[] output) {
         super(errorCode, output);
     }
+
+    @Override
+    public String getLabel() {
+        return "Proguard";
+    }
 }