diff options
| author | bohu <bohu@google.com> | 2015-05-08 21:39:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-05-08 21:39:10 +0000 |
| commit | 42d721d0295294bb7977c2e71dc180332bc016b5 (patch) | |
| tree | fb34ea1df684773b79596dd9c382a31570b90bc7 | |
| parent | f74d5188a512984113da6c5ef85ea71dc4fb0950 (diff) | |
| parent | 670b25448d5a584c8fd8fa6e77dbe8f452c698b4 (diff) | |
| download | buildSrc-42d721d0295294bb7977c2e71dc180332bc016b5.tar.gz | |
qemu2: build dependencies before building qemu2
automerge: 670b254
* commit '670b25448d5a584c8fd8fa6e77dbe8f452c698b4':
qemu2: build dependencies before building qemu2
| -rw-r--r-- | src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy | 7 |
1 files changed, 6 insertions, 1 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 6df5160..3fbd5eb 100644 --- a/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy +++ b/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy @@ -44,7 +44,8 @@ class BuildEmulator extends DefaultTask { @TaskAction void build() { - 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 qemu2_deps_command = "$project.projectDir/android/scripts/build-qemu-android-deps.sh --verbose --force"; + String qemu2_command = "$project.projectDir/android/scripts/build-qemu-android.sh --verbose --force --target=arm64,mips64,x86_64 " + (windows? "--host=windows-x86,windows-x86_64" : "") String command = windows ? "$project.projectDir/android-rebuild.sh --verbose --mingw --out-dir=$output" : @@ -53,6 +54,10 @@ class BuildEmulator extends DefaultTask { StringBuilder stdout = new StringBuilder() StringBuilder stderr = new StringBuilder() + Process qemu2_deps_p = qemu2_deps_command.execute() + qemu2_deps_p.consumeProcessOutput(stdout, stderr) + int qemu2_deps_result = qemu2_deps_p.waitFor() + Process qemu2_p = qemu2_command.execute() qemu2_p.consumeProcessOutput(stdout, stderr) int qemu2_result = qemu2_p.waitFor() |