Sigh, some people are parsing the old format.

Give them what they want.

Test: ./gradlew updateApi
Bug: 37526420
Change-Id: I6e98042e10ee134b8b158c481bf14ce87792d434

2 files changed, 24 insertions, 9 deletions

diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index 1e2baf5..3ceec20 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -117,6 +117,7 @@ public class Doclava {
   public static boolean staticOnly = false;
   public static AuxSource auxSource = new EmptyAuxSource();
   public static Linter linter = new EmptyLinter();
+  public static boolean android = false;
 
   public static JSilver jSilver = null;
 
@@ -350,6 +351,7 @@ public class Doclava {
       } else if (a[0].equals("-android")) {
         auxSource = new AndroidAuxSource();
         linter = new AndroidLinter();
+        android = true;
       }
     }
 
diff --git a/src/com/google/doclava/Errors.java b/src/com/google/doclava/Errors.java
index 7c2c7a1..de92fdf 100644
--- a/src/com/google/doclava/Errors.java
+++ b/src/com/google/doclava/Errors.java
@@ -50,16 +50,29 @@ public class Errors {
     @Override
     public String toString() {
       StringBuilder res = new StringBuilder();
-      res.append("\033[1m").append(pos.toString()).append(": ");
-      switch (error.getLevel()) {
-        case LINT: res.append("\033[36mlint: "); break;
-        case WARNING: res.append("\033[33mwarning: "); break;
-        case ERROR: res.append("\033[31merror: "); break;
-        default: break;
+      if (Doclava.android) {
+        res.append("\033[1m").append(pos.toString()).append(": ");
+        switch (error.getLevel()) {
+          case LINT: res.append("\033[36mlint: "); break;
+          case WARNING: res.append("\033[33mwarning: "); break;
+          case ERROR: res.append("\033[31merror: "); break;
+          default: break;
+        }
+        res.append("\033[0m");
+        res.append(msg);
+        res.append(" [").append(error.code).append("]");
+      } else {
+        // Sigh, some people are parsing the old format.
+        res.append(pos.toString()).append(": ");
+        switch (error.getLevel()) {
+          case LINT: res.append("lint "); break;
+          case WARNING: res.append("warning "); break;
+          case ERROR: res.append("error "); break;
+          default: break;
+        }
+        res.append(error.code).append(": ");
+        res.append(msg);
       }
-      res.append("\033[0m");
-      res.append(msg);
-      res.append(" [").append(error.code).append("]");
       return res.toString();
     }