added squisher
diff --git a/tools/opticharger b/tools/opticharger
new file mode 100755
index 0000000..a3d7ade
--- /dev/null
+++ b/tools/opticharger
@@ -0,0 +1,149 @@
+#!/bin/sh
+#
+# Super-mega opticharger of doom
+# Shrinks apks by running pngcrush or optipng or pngout on png images
+#
+# Point APKCERTS at the full path to a generated apkcerts.txt file, such as:
+# /home/shade/dev/sources/android-cm-eclair/out/target/product/dream_sapphire/obj/PACKAGING/target_files_intermediates/cyanogen_dream_sapphire-target_files-eng.shade/META/apkcerts.txt
+#
+# cyanogen - shade@chemlab.org
+# ChrisSoyars - me@ctso.me
+
+set -e
+QUIET=1
+BASE=`pwd`
+BRUTECRUSH="-brute"
+TMPDIR=/tmp/opticharge-$$
+
+if [ -z "$BRUTE_PNGCRUSH" ]
+then
+ BRUTECRUSH=""
+fi
+
+if [ "$APKCERTS" = "" ];
+then
+ if [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then
+ TARGET_BUILD_VARIANT="eng"
+ elif [ "$TARGET_BUILD_VARIANT" = "user" ]; then
+ TARGET_BUILD_VARIANT="eng"
+ fi
+
+ APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$USER/META/apkcerts.txt
+ if [ ! -f "$APKCERTS" ];
+ then
+ echo "Set APKCERTS to the path to your apkcerts.txt file"
+ exit 1;
+ fi
+fi
+
+if [ ! -f "$APKCERTS" ];
+then
+ echo "Invalid path to apkcerts.txt, set APKCERTS to the correct path."
+fi
+
+if [ "$(which pngcrush)" != "" ];
+then
+ optimize_png () {
+ pngcrush -q ${BRUTECRUSH} $1 ${1}.out 1> /dev/null 2> /dev/null
+ mv ${1}.out ${1}
+ }
+elif [ "$(which optipng)" != "" ];
+then
+ optimize_png () {
+ optipng -o7 -quiet $1 1> /dev/null 2> /dev/null
+ }
+elif [ "$(which pngout-static)" != "" ];
+then
+ optimize_png () {
+ pngout-static $1
+ }
+elif [ "$(which pngout)" != "" ];
+then
+ optimize_png () {
+ pngout $1
+ }
+else
+ echo "Please install pngcrush, optipng, or pngout"
+ exit 1;
+fi
+
+if [ "`which aapt`" = "" ];
+then
+ echo "Please ensure aapt is in your \$PATH"
+ exit 1;
+fi
+
+if [ "`which zipalign`" = "" ];
+then
+ echo "Please ensure zipalign is in your \$PATH"
+ exit 1;
+fi
+
+if [ -e "$1" ];
+then
+ NAME=`basename $1`;
+ echo "Optimizing $NAME...";
+
+ if [ "$2" != "" ];
+ then
+ CERT=build/target/product/security/$2.x509.pem
+ KEY=build/target/product/security/$2.pk8
+ if [ ! -f "$ANDROID_BUILD_TOP/$CERT" ];
+ then
+ echo "$CERT does not exist!";
+ exit 1;
+ fi
+ else
+ APKINFO=`grep "name=\"$NAME\"" $APKCERTS`;
+ [ $QUIET ] || echo "APKINFO: $APKINFO";
+ if [ "$APKINFO" = "" ];
+ then
+ echo "No apk info for $NAME";
+ exit 1;
+ fi
+ CERT=`echo $APKINFO | awk {'print $2'} | cut -f 2 -d "=" | tr -d "\""`;
+ KEY=`echo $APKINFO | awk {'print $3'} | cut -f 2 -d "=" | tr -d "\""`;
+ if [ "$CERT" = "" ];
+ then
+ echo "Unable to find certificate for $NAME"
+ exit 1;
+ fi
+ if [ "$CERT" = "PRESIGNED" ];
+ then
+ echo "$NAME is presigned, skipping"
+ exit 1;
+ fi
+ fi
+
+ [ $QUIET ] || echo "Certificate: $CERT";
+
+ [ -d $TMPDIR/$NAME ] && rm -rf $TMPDIR/$NAME
+ mkdir -p $TMPDIR/$NAME
+ trap "rm -rf $TMPDIR; exit" INT TERM EXIT
+ cd $TMPDIR/$NAME
+ unzip -q $BASE/$1
+ for x in `find . -name "*.png" | grep -v "\.9.png$" | tr "\n" " "`
+ do
+ [ $QUIET ] || echo "Crushing $x"
+ optimize_png $x
+ done
+ cp $BASE/$1 $BASE/$1.old
+
+ [ $QUIET ] || echo "Repacking apk.."
+ aapt p -0 .dat -0 .dict -0 .arsc -F $NAME .
+
+ [ $QUIET ] || echo "Resigning with cert: `echo $CERT`"
+
+ [ $QUIET ] || echo java -jar $ANDROID_HOST_OUT/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME
+ java -jar $ANDROID_HOST_OUT/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME
+ [ $QUIET ] || echo "Zipalign.."
+ zipalign -f 4 signed_$NAME $BASE/$1
+ if [ ! $QUIET ]; then
+ ls -l $BASE/$1.old
+ ls -l $BASE/$1
+ fi
+ rm $BASE/$1.old
+else
+ echo "Usage: $0 [apk file]"
+fi
+
diff --git a/tools/squisher b/tools/squisher
new file mode 100755
index 0000000..ce94537
--- /dev/null
+++ b/tools/squisher
@@ -0,0 +1,127 @@
+#!/bin/sh
+#
+# Squish a CM otapackage for distribution
+# cyanogen
+#
+
+OUT_TARGET_HOST=`uname -a | grep Darwin`
+if [ -z "$OUT_TARGET_HOST" ]
+then
+ OUT_TARGET_HOST=linux-x86
+ MD5=md5sum
+ XARGS="xargs --max-args=1 --max-procs `grep 'processor' /proc/cpuinfo|wc -l`"
+ SED=sed
+else
+ OUT_TARGET_HOST=darwin-x86
+ MD5=md5
+ XARGS="xargs -n 1 -P `sysctl hw.ncpu | awk '{print $2}'`"
+ SED=gsed
+fi
+
+if [ -z "$OUT" -o ! -d "$OUT" ]; then
+ echo "ERROR: $0 only works with a full build environment. $OUT should exist."
+ exit 1
+fi
+
+if [ "$TARGET_BUILD_TYPE" = "debug" ]; then
+ OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$USER.zip
+elif [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then
+ OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-eng.$USER.zip
+elif [ "$TARGET_BUILD_VARIANT" = "user" ]; then
+ OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-eng.$USER.zip
+else
+ OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
+fi
+if [ ! -f "$OTAPACKAGE" ]; then
+ echo "$OTAPACKAGE doesn't exist!";
+ exit 1
+fi
+
+OPTICHARGER=$ANDROID_BUILD_TOP/vendor/cm/tools/opticharger
+QUIET=-q
+DELETE_BINS="applypatch applypatch_static check_prereq recovery updater"
+
+REPACK=$OUT/repack.d
+printf "Sanitizing environment..."
+rm -rf $REPACK
+mkdir -p $REPACK
+echo
+
+
+# Unpack the otapackage and opticharge all apks
+mkdir $REPACK/ota
+(
+cd $REPACK/ota
+printf "Unpacking $OTAPACKAGE..."
+unzip $QUIET $OTAPACKAGE
+echo
+
+# Move all apks to the same directory so xargs can
+# use also with framework-res.apk. This allow process
+# framework-res.apk in parallel with other apks
+mkdir -p $REPACK/parallel
+cd $REPACK/parallel
+cp $REPACK/ota/system/framework/framework-res.apk .
+cp $REPACK/ota/system/app/*.apk .
+
+# Do optimization in parallel
+find ./ -name \*.apk | $XARGS $OPTICHARGER
+
+# Move optimized apks to repack directory
+mv -f $REPACK/parallel/framework-res.apk $REPACK/ota/system/framework/framework-res.apk
+mv -f $REPACK/parallel/*.apk $REPACK/ota/system/app/
+
+# Return to directory
+cd $REPACK/ota
+rm -rf $REPACK/parallel
+)
+
+# Fix build.prop
+$SED -i \
+ -e '/ro\.kernel\.android\.checkjni/d' \
+ -e '/ro\.build\.type/s/eng/user/' \
+ $REPACK/ota/system/build.prop
+
+
+# Delete unnecessary binaries
+( cd $REPACK/ota/system/bin; echo $DELETE_BINS | xargs rm -f; )
+
+# No need for recovery
+rm -rf $REPACK/ota/recovery
+
+# Strip modules
+[ -d $REPACK/ota/system/lib/modules ] && \
+ find $REPACK/ota/system/lib/modules -name "*.ko" -print0 | xargs -0 arm-eabi-strip --strip-unneeded
+
+# Determine what to name the new signed package
+MODVERSION=`sed -n -e'/ro\.cm\.version/s/^.*=//p' $REPACK/ota/system/build.prop`
+OUTFILE=$OUT/cm-$MODVERSION.zip
+echo MODVERSION: $MODVERSION
+
+# Pack it up and sign
+printf "Zipping package..."
+( cd $REPACK/ota; zip $QUIET -r $REPACK/update.zip . )
+echo
+printf "Signing package..."
+SECURITYDIR=$ANDROID_BUILD_TOP/build/target/product/security
+java -Xmx1024m \
+ -jar $OUT/../../../host/$OUT_TARGET_HOST/framework/signapk.jar \
+ -w $SECURITYDIR/testkey.x509.pem $SECURITYDIR/testkey.pk8 \
+ $REPACK/update.zip $OUTFILE
+echo
+printf "Cleaning up..."
+rm -rf $REPACK
+echo
+
+# Create a md5 checksum image of the repacked package
+(
+img=`basename $OUTFILE`
+cd `dirname $OUTFILE`
+$MD5 $img >$img.md5sum
+echo
+echo "Package complete: $OUTFILE"
+cat $img.md5sum
+echo
+)
+
+exit 0