BuildEmulator: Dump build messages after qemu2deps and qemu2

To make it less painful to debug build errors on buildbot.

Change-Id: Ib06718af1e085cfb014e533d39559a15318b799f

1 files changed, 14 insertions, 0 deletions

diff --git a/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy b/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy
index 46b8ac4..fc9bb36 100644
--- a/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy
+++ b/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy
@@ -62,10 +62,24 @@ class BuildEmulator extends DefaultTask {
         qemu2_deps_p.consumeProcessOutput(stdout, stderr)
         int qemu2_deps_result = qemu2_deps_p.waitFor()
 
+        logger.log(LogLevel.INFO, stdout.toString())
+        logger.log(LogLevel.ERROR, stderr.toString())
+
+        if (qemu2_deps_result != 0) {
+            throw new BuildException("Failed to build qemu2 deps. See console output", null)
+        }
+
         Process qemu2_p = qemu2_command.execute()
         qemu2_p.consumeProcessOutput(stdout, stderr)
         int qemu2_result = qemu2_p.waitFor()
 
+        logger.log(LogLevel.INFO, stdout.toString())
+        logger.log(LogLevel.ERROR, stderr.toString())
+
+        if (qemu2_result != 0) {
+            throw new BuildException("Failed to build qemu2. See console output", null)
+        }
+
         Process p = command.execute()
         p.consumeProcessOutput(stdout, stderr)