diff options
| author | David 'Digit' Turner <digit@google.com> | 2016-11-22 15:07:43 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2016-11-22 15:07:43 +0100 |
| commit | 95e12d60fd3f02ef71d47b212736f2c08a79205e (patch) | |
| tree | 0714d38aaf1d70b38b197117a95c38441294943d | |
| parent | 71d6d8665992ca8a298e5526be53ca2d5cb40aa0 (diff) | |
| download | buildSrc-95e12d60fd3f02ef71d47b212736f2c08a79205e.tar.gz | |
BuildEmulator.groovy: Call android/rebuild.sh instead of android-rebuild.sh
The location of the emulator's rebuild script has been moved to prepare
for the merge of the QEMU1 and QEMU2 git repositories. Update the groovy
script accordingly.
Change-Id: I6b0d165d5e75d3c8402c53353497e2547d6d5256
| -rw-r--r-- | src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy | 6 |
1 files changed, 3 insertions, 3 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 4472e7e..e7433df 100644 --- a/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy +++ b/src/main/groovy/com/android/tools/internal/emulator/BuildEmulator.groovy @@ -92,8 +92,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 --symbols --crash-prod" : - "$project.projectDir/android-rebuild.sh --verbose --out-dir=$output --sdk-revision=$revision --sdk-build-number=$build_number --symbols --crash-prod" + "$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" LoggerWriter stdout = new LoggerWriter(logger, LogLevel.INFO) LoggerWriter stderr = new LoggerWriter(logger, LogLevel.ERROR) @@ -104,7 +104,7 @@ class BuildEmulator extends DefaultTask { int result = p.waitFor() if (result != 0) { - throw new BuildException("Failed to run android-rebuild command. See console output", null) + throw new BuildException("Failed to run android/rebuild.sh command. See console output", null) } stdout.reset(); |