diff options
| author | bohu <bohu@google.com> | 2015-10-13 12:48:46 -0700 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2015-10-13 12:48:46 -0700 |
| commit | 191385d6576ec1d7d3e9374354ce5bd2b9a387b5 (patch) | |
| tree | 2035e5681b776564dfd3f20e0594af1772de460a | |
| parent | bb6112dccd16288f2f46c9a4cbe95df25813cb42 (diff) | |
| download | buildSrc-191385d6576ec1d7d3e9374354ce5bd2b9a387b5.tar.gz | |
Emulator: Build e2fsprogs binaries for data disk resizingstudio-1.4-dev
Need to build explicitly since there are no prebuilts in 1.4
Change-Id: I5b3d9172603584c69827b18a87e1b44d0209487a
| -rw-r--r-- | src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy | 6 |
1 files changed, 6 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 b42ebbd..8cf6e4c 100644 --- a/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy +++ b/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy @@ -51,6 +51,8 @@ class BuildEmulator extends DefaultTask { 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 e2fsprogs_command = "$project.projectDir/android/scripts/build-e2fsprogs.sh"; + String command = windows ? "$project.projectDir/android-rebuild.sh --verbose --mingw --out-dir=$output --sdk-revision=$revision" : "$project.projectDir/android-rebuild.sh --verbose --out-dir=$output --sdk-revision=$revision" @@ -66,6 +68,10 @@ class BuildEmulator extends DefaultTask { qemu2_p.consumeProcessOutput(stdout, stderr) int qemu2_result = qemu2_p.waitFor() + Process e2fsprogs_p = e2fsprogs_command.execute(); + e2fsprogs_p.consumeProcessOutput(stdout, stderr); + int e2fsprogs_result = e2fsprogs_p.waitFor(); + Process p = command.execute() p.consumeProcessOutput(stdout, stderr) |