From a5982b2e3034f524618a3f675b36fc3c57ce62e1 Mon Sep 17 00:00:00 2001 From: Wes Garner Date: Tue, 20 Jul 2010 13:39:05 -0500 Subject: [PATCH] Define the use of SquashFS for xbin via the product --- products/cyanogen_dream_sapphire.mk | 3 +++ tools/squisher | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk index 1b3fe236..d0c5298b 100644 --- a/products/cyanogen_dream_sapphire.mk +++ b/products/cyanogen_dream_sapphire.mk @@ -49,6 +49,9 @@ WITH_DS_HTCACOUSTIC_HACK := true # Use Windows Media WITH_WINDOWS_MEDIA := true +# Use SquashFS for xbin +WANT_SQUASHFS := true + # # Copy DS specific prebuilt files # diff --git a/tools/squisher b/tools/squisher index 190d4f7b..e2665bb9 100755 --- a/tools/squisher +++ b/tools/squisher @@ -31,12 +31,8 @@ DELETE_BINS="applypatch applypatch_static check_prereq recovery updater" # Some products want a squashfs for xbin for space -case "$TARGET_PRODUCT" in - cyanogen_dream_sapphire) WANT_SQUASHFS=1 ;; - *) WANT_SQUASHFS=0 ;; -esac -if [ "$WANT_SQUASHFS" -eq 1 ]; then +if [ -n "$WANT_SQUASHFS" ]; then fatal=0 MKSQUASHFS_VER_REQ=4 if type mksquashfs >/dev/null 2>&1; then @@ -80,7 +76,7 @@ for i in *.apk; do $OPTICHARGER $i; done ) -if [ "$WANT_SQUASHFS" -eq 1 ]; then +if [ -n "$WANT_SQUASHFS" ]; then squash_opts="-force-uid 1000 -force-gid 1000 -no-progress -noappend -no-exports -no-recovery" updater=$REPACK/ota/META-INF/com/google/android/updater-script