Improve the error messaging by suppressing stack traces for expected errors.

RELNOTES: None
PiperOrigin-RevId: 177460834

1 files changed, 6 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java b/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
index f4b70fc930..4a7e711b0a 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
@@ -302,13 +302,17 @@ public class AaptCommandBuilder {
 
     final Process process = new ProcessBuilder().command(command).redirectErrorStream(true).start();
     processLog.append("Command: ");
-    Joiner.on("\n\t").appendTo(processLog, command);
-    processLog.append("\n");
+    Joiner.on("\\\n\t").appendTo(processLog, command);
+    processLog.append("\nOutput:\n");
     final InputStreamReader stdout =
         new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8);
     while (process.isAlive()) {
       processLog.append(CharStreams.toString(stdout));
     }
+    // Make sure the full stdout is read.
+    while (stdout.ready()) {
+      processLog.append(CharStreams.toString(stdout));
+    }
     if (process.exitValue() != 0) {
       throw new RuntimeException(String.format("Error during %s:", action) + "\n" + processLog);
     }