Final tweaks and fixes to enable aapt2 for Blaze.

Implemented processing databinding for compile passes

RELNOTES: None
PiperOrigin-RevId: 166215052

1 files changed, 5 insertions, 3 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 a0549c879b..6e9c9a41ab 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
@@ -244,10 +244,12 @@ public class AaptCommandBuilder {
    * @throws IOException when the process cannot execute.
    */
   public String execute(String action) throws IOException {
-    StringBuilder processLog = new StringBuilder();
-    final Process process = new ProcessBuilder().command(build()).redirectErrorStream(true).start();
+    final StringBuilder processLog = new StringBuilder();
+    List<String> command = build();
+
+    final Process process = new ProcessBuilder().command(command).redirectErrorStream(true).start();
     processLog.append("Command: ");
-    Joiner.on(" ").appendTo(processLog, build());
+    Joiner.on("\n\t").appendTo(processLog, command);
     processLog.append("\n");
     final InputStreamReader stdout =
         new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8);