diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-07-24 18:33:52 -0400 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-07-24 18:33:52 -0400 |
| commit | d5f3e1509368448e2c68156cf40781bd0c53a32a (patch) | |
| tree | c2bb37ca3a3eceed474e5e17d2557d2d0880ce1a | |
| parent | 4f9ed5a65fdf696ada521fb559ee3ebeb2ca60ca (diff) | |
| download | vendor_replicant-d5f3e1509368448e2c68156cf40781bd0c53a32a.zip vendor_replicant-d5f3e1509368448e2c68156cf40781bd0c53a32a.tar.gz vendor_replicant-d5f3e1509368448e2c68156cf40781bd0c53a32a.tar.bz2 | |
Revert "Define the use of SquashFS for xbin via the product"
This reverts commit fb778f809f5203abe86f88c011c641e841b84095.
| -rw-r--r-- | products/cyanogen_dream_sapphire.mk | 3 | ||||
| -rwxr-xr-x | tools/squisher | 8 |
2 files changed, 6 insertions, 5 deletions
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 @@ 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 e2665bb..190d4f7 100755 --- a/tools/squisher +++ b/tools/squisher @@ -31,8 +31,12 @@ 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 [ -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 @@ for i in *.apk; do $OPTICHARGER $i; done ) -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 |