diff options
| author | David Turner <digit@google.com> | 2015-07-17 10:03:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-17 10:03:55 +0000 |
| commit | ccc67f3f00dd92210b64c610abbb93bb557ac526 (patch) | |
| tree | 0fd4ef763039f845ec4713991f8f41c55b1e0e99 | |
| parent | a9fc4063095c729f6dc7392ee83ff01a553be00a (diff) | |
| parent | 1c9f59e4b8e8da24b86f1286b3d731d8b5c5399d (diff) | |
| download | qemu-ccc67f3f00dd92210b64c610abbb93bb557ac526.tar.gz | |
Merge "Copy windows 32-bit e2fsprogs executables into $OUT_DIR/bin64" into studio-1.4-dev
| -rwxr-xr-x | android-rebuild.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/android-rebuild.sh b/android-rebuild.sh index 8a3b36820d..2fc39219c7 100755 --- a/android-rebuild.sh +++ b/android-rebuild.sh @@ -271,7 +271,13 @@ if true; then # be replaced by a panic/fi in a future patch. echo "Copying e2fsprogs binaries." for E2FS_ARCH in x86 x86_64; do - E2FS_SRCDIR=$E2FSPROGS_DIR/$TARGET_OS-$E2FS_ARCH + # NOTE: in windows only 32-bit binaries are available, so we'll copy the + # 32-bit executables to the bin64/ directory to cover all our bases + case $TARGET_OS in + windows) E2FS_SRCDIR=$E2FSPROGS_DIR/$TARGET_OS-x86;; + *) E2FS_SRCDIR=$E2FSPROGS_DIR/$TARGET_OS-$E2FS_ARCH;; + esac + case $E2FS_ARCH in x86) E2FS_DSTDIR=$OUT_DIR/bin;; x86_64) E2FS_DSTDIR=$OUT_DIR/bin64;; |