aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2015-05-07 13:45:52 -0700
committerbohu <bohu@google.com>2015-05-07 13:45:52 -0700
commitdaa422ee7398aa854bee207bd0e41ffbaa67ba48 (patch)
tree28a0e824c02b4d52f54f2fb1050a5db948ff775a
parentb9cd098f849e4f46b95917adbcb505433ae78847 (diff)
downloadbuildSrc-daa422ee7398aa854bee207bd0e41ffbaa67ba48.tar.gz
Fix qemu2-emulator build
Now it uses prebuilts, instead of downloading during build time. Change-Id: I8d2318b328c1bf763fa8fbb858417542bbe45229
-rw-r--r--src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy6
1 files changed, 0 insertions, 6 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 d6fb41d..6df5160 100644
--- a/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy
+++ b/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy
@@ -46,8 +46,6 @@ class BuildEmulator extends DefaultTask {
String qemu2_command = "$project.projectDir/android/scripts/build-qemu-android.sh --verbose --target=arm64,mips64,x86_64 " + (windows? "--host=windows-x86,windows-x86_64" : "")
- String mesa_command = "$project.projectDir/android/scripts/build-mesa.sh --verbose " + (windows? " --host=windows-x86,windows-x86_64" : "")
-
String command = windows ?
"$project.projectDir/android-rebuild.sh --verbose --mingw --out-dir=$output" :
"$project.projectDir/android-rebuild.sh --verbose --out-dir=$output"
@@ -59,10 +57,6 @@ class BuildEmulator extends DefaultTask {
qemu2_p.consumeProcessOutput(stdout, stderr)
int qemu2_result = qemu2_p.waitFor()
- Process mesa_p = mesa_command.execute()
- mesa_p.consumeProcessOutput(stdout, stderr)
- int mesa_result = mesa_p.waitFor()
-
Process p = command.execute()
p.consumeProcessOutput(stdout, stderr)