diff options
| author | David Turner <digit@google.com> | 2015-07-17 17:16:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-07-17 17:16:17 +0000 |
| commit | 89057119d7b854776ed04baed9de73d093fb4f97 (patch) | |
| tree | 90e5b2864adcdade4c2dfe4ae2f7d26d02254685 | |
| parent | 0e01999b0bced7d784b4d617a1ca55c9451333e3 (diff) | |
| parent | 599aa6763471e2816d49b115ad7d60f918e2c5a2 (diff) | |
| download | qemu-89057119d7b854776ed04baed9de73d093fb4f97.tar.gz | |
Merge "Copy windows 32-bit e2fsprogs executables into /bin64" into studio-1.4-dev automerge: ccc67f3
automerge: 599aa67
* commit '599aa6763471e2816d49b115ad7d60f918e2c5a2':
Copy windows 32-bit e2fsprogs executables into $OUT_DIR/bin64
| -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;; |