Revert "Define the use of SquashFS for xbin via the product"
This reverts commit fb778f809f5203abe86f88c011c641e841b84095.
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index d0c5298..1b3fe23 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -49,9 +49,6 @@
# 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 e2665bb..190d4f7 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -31,8 +31,12 @@
# Some products want a squashfs for xbin for space
+case "$TARGET_PRODUCT" in
+ cyanogen_dream_sapphire) WANT_SQUASHFS=1 ;;
+ *) WANT_SQUASHFS=0 ;;
+esac
-if [ -n "$WANT_SQUASHFS" ]; then
+if [ "$WANT_SQUASHFS" -eq 1 ]; then
fatal=0
MKSQUASHFS_VER_REQ=4
if type mksquashfs >/dev/null 2>&1; then
@@ -76,7 +80,7 @@
)
-if [ -n "$WANT_SQUASHFS" ]; then
+if [ "$WANT_SQUASHFS" -eq 1 ]; 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