diff options
| author | Kirsten Lee <kirstenlee@google.com> | 2015-07-16 17:19:40 -0700 |
|---|---|---|
| committer | Kirsten Lee <kirstenlee@google.com> | 2015-07-16 17:27:34 -0700 |
| commit | 1c9f59e4b8e8da24b86f1286b3d731d8b5c5399d (patch) | |
| tree | 0fd4ef763039f845ec4713991f8f41c55b1e0e99 | |
| parent | a9fc4063095c729f6dc7392ee83ff01a553be00a (diff) | |
| download | qemu-1c9f59e4b8e8da24b86f1286b3d731d8b5c5399d.tar.gz | |
Copy windows 32-bit e2fsprogs executables into $OUT_DIR/bin64
Only 32-bit e2fsprogs executables are available, so copy the 32-bit
executables into both bin/ and bin64/ to simplify the runtime logic
of locating resize2fs.exe
Change-Id: I2c64c286ba83ea3b1bdd5cc83d1ee84a0ff6f1c2
| -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;; |