summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohamad Ayyash <mkayyash@google.com>2016-06-15 15:53:55 -0700
committerThe Android Automerger <android-build@google.com>2016-06-17 15:21:21 -0700
commit9971a9d02a90e3093e7b3b44b1e67ffb84b7fe0b (patch)
tree300d8805fa235f0cfe383a439e971547e67a800f
parent66ae321f2121d0cc7fe0f392d1fc81763cba9183 (diff)
downloadextras-9971a9d02a90e3093e7b3b44b1e67ffb84b7fe0b.tar.gz
mksquashfsimage.sh: Make disable-4k-align a paramter
BUG: 29388879 Change-Id: I6ede2273419ba986d08decc0540741c54ed736b1 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
-rwxr-xr-xsquashfs_utils/mksquashfsimage.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/squashfs_utils/mksquashfsimage.sh b/squashfs_utils/mksquashfsimage.sh
index 05ca4e0b..5f45a648 100755
--- a/squashfs_utils/mksquashfsimage.sh
+++ b/squashfs_utils/mksquashfsimage.sh
@@ -5,7 +5,7 @@
function usage() {
cat<<EOT
Usage:
-${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-B BLOCK_MAP_FILE] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT]
+${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-B BLOCK_MAP_FILE] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT] [-a ]
EOT
}
@@ -79,6 +79,12 @@ if [[ "$1" == "-zo" ]]; then
shift; shift
fi
+DISABLE_4K_ALIGN=false
+if [[ "$1" == "-a" ]]; then
+ DISABLE_4K_ALIGN=true
+ shift;
+fi
+
OPT=""
if [ -n "$MOUNT_POINT" ]; then
OPT="$OPT -mount-point $MOUNT_POINT"
@@ -98,6 +104,9 @@ fi
if [ -n "$BLOCK_SIZE" ]; then
OPT="$OPT -b $BLOCK_SIZE"
fi
+if [ "$DISABLE_4K_ALIGN" = true ]; then
+ OPT="$OPT -disable-4k-align"
+fi
MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR/ $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -no-exports -noappend -no-recovery -no-fragments -no-duplicates -android-fs-config $OPT"
echo $MAKE_SQUASHFS_CMD