Enabling build system production crash reportingemu-1.5-release

Enabling build flags to upload crash dumps to production servers.
Enabling symbol upload to production server.

Change-Id: I2cdd5656459e9e05441157ca9d383293753e7272

1 files changed, 23 insertions, 2 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 b43e950..d90aa17 100644
--- a/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy
+++ b/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy
@@ -51,8 +51,8 @@ class BuildEmulator extends DefaultTask {
     void build() {
 
         String command = windows ?
-                "$project.projectDir/android-rebuild.sh --verbose --mingw --out-dir=$output --sdk-revision=$revision --sdk-build-number=$build_number" :
-                "$project.projectDir/android-rebuild.sh --verbose --out-dir=$output --sdk-revision=$revision --sdk-build-number=$build_number"
+                "$project.projectDir/android-rebuild.sh --verbose --mingw --out-dir=$output --sdk-revision=$revision --sdk-build-number=$build_number --symbols --crash-prod" :
+                "$project.projectDir/android-rebuild.sh --verbose --out-dir=$output --sdk-revision=$revision --sdk-build-number=$build_number --symbols --crash-prod"
 
         StringBuilder stdout = new StringBuilder()
         StringBuilder stderr = new StringBuilder()
@@ -68,5 +68,26 @@ class BuildEmulator extends DefaultTask {
         if (result != 0) {
             throw new BuildException("Failed to run command. See console output", null)
         }
+
+        /**
+         * Upload the symbols
+         */
+        command = "$project.projectDir/android/scripts/upload-symbols.sh --crash-prod --symbol-dir=$output/build/symbols"
+
+        stdout = new StringBuilder()
+        stderr = new StringBuilder()
+
+        p = command.execute()
+        p.consumeProcessOutput(stdout, stderr)
+
+        result = p.waitFor()
+
+        logger.log(LogLevel.INFO, stdout.toString())
+        logger.log(LogLevel.ERROR, stderr.toString())
+
+        if (result != 0) {
+            throw new BuildException("Failed to run command. See console output", null)
+        }
+
     }
 }