Emulator: Build e2fsprogs binaries for data disk resizing
Need to build explicitly since there are no prebuilts in 1.4
Change-Id: I5b3d9172603584c69827b18a87e1b44d0209487a
(cherry picked from commit 191385d6576ec1d7d3e9374354ce5bd2b9a387b5)
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 @@
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 @@
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)