Add New Squisher/Opticharger for Lollipop (2/2)
* From AOSPA-legacy/android_vendor_pa@f07d19e23a45216a86a7ef1273e27cce880d5959 and AOSPA-legacy/android_vendor_pa@1d56c3fc1f92b52bf6388e1322041f0324f44512
diff --git a/utils/colors b/utils/colors
new file mode 100755
index 0000000..15cd1d0
--- /dev/null
+++ b/utils/colors
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ ! "$BUILD_WITH_COLORS" = "0" ]; then
+ CL_RED="\033[31m" # RED
+ CL_GRN="\033[32m" # Green
+ CL_YLW="\033[33m" # Yellow
+ CL_BLU="\033[34m" # Blue
+ CL_MAG="\033[35m" # Magenta/Purple
+ CL_CYN="\033[36m" # Cyan
+ CL_RST="\033[0m" # Reset
+fi
diff --git a/utils/opticharger b/utils/opticharger
new file mode 100755
index 0000000..f3e788c
--- /dev/null
+++ b/utils/opticharger
@@ -0,0 +1,163 @@
+#!/bin/bash
+#
+# Super-mega LiquidSmooth opticharger of doom
+# Shrinks apks by running pngquant or pngcrush or optipng or pngout on png images
+#
+
+. $ANDROID_BUILD_TOP/vendor/aosp/utils/colors
+
+OUT_TARGET_HOST=$(uname -a | grep Darwin)
+if [ -z "$OUT_TARGET_HOST" ]
+then
+ OUT_TARGET_HOST=linux-x86
+else
+ OUT_TARGET_HOST=darwin-x86
+fi
+
+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 -e ${CL_RED}"Set APKCERTS to the path to your apkcerts.txt file"${CL_RST}
+ exit 1;
+ fi
+fi
+
+if [ ! -f "$APKCERTS" ];
+then
+ echo -e ${CL_RED}"Invalid path to apkcerts.txt, set APKCERTS to the correct path."${CL_RST}
+fi
+
+if [ "$(which pngquant)" != "" ];
+then
+ optimize_png () {
+ pngquant --speed 1 --force --ext .png $1 1> /dev/null 2> /dev/null
+ }
+elif [ "$(which pngcrush)" != "" ];
+then
+ optimize_png () {
+ pngcrush -q ${BRUTECRUSH} $1 ${1}.out 1> /dev/null 2> /dev/null
+ mv ${1}.out ${1} 2> /dev/null
+ }
+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 -e ${CL_RED}"Please install pngquant, pngcrush, optipng, or pngout"${CL_RST}
+ exit 1;
+fi
+
+if [ "`which aapt`" = "" ];
+then
+ echo -e ${CL_RED}"Please ensure aapt is in your \$PATH"${CL_RST}
+ exit 1;
+fi
+
+if [ "`which zipalign`" = "" ];
+then
+ echo -e ${CL_RED}"Please ensure zipalign is in your \$PATH"${CL_RST}
+ exit 1;
+fi
+
+if [ -e "$1" ];
+then
+ NAME=`basename $1`;
+ echo -e ${CL_GRN}"Optimizing:${CL_RST} $NAME...";
+
+ if [ "$2" != "" ];
+ then
+ if [ "$DEFAULT_SYSTEM_DEV_CERTIFICATE" ]; then
+ CERT_PATH=`dirname $DEFAULT_SYSTEM_DEV_CERTIFICATE`
+ else
+ CERT_PATH=build/target/product/security
+ fi
+ CERT="$CERT_PATH"/$2.x509.pem
+ KEY="$CERT_PATH"/$2.pk8
+ if [ ! -f "$ANDROID_BUILD_TOP/$CERT" ];
+ then
+ echo -e ${CL_RED}"$CERT does not exist!"${CL_RST};
+ exit 1;
+ fi
+ else
+ APKINFO=`grep "name=\"$NAME\"" $APKCERTS`;
+ [ $QUIET ] || echo -e "APKINFO: $APKINFO";
+ if [ "$APKINFO" = "" ];
+ then
+ echo -e ${CL_RED}"No apk info for $NAME"${CL_RST};
+ exit 1;
+ fi
+ CERT=`echo -e $APKINFO | awk {'print $2'} | cut -f 2 -d "=" | tr -d "\""`;
+ KEY=`echo -e $APKINFO | awk {'print $3'} | cut -f 2 -d "=" | tr -d "\""`;
+ if [ "$CERT" = "" ];
+ then
+ echo -e ${CL_RED}"Unable to find certificate for $NAME"${CL_RST}
+ exit 1;
+ fi
+ if [ "$CERT" = "PRESIGNED" ];
+ then
+ echo -e ${CL_CYN}"$NAME is presigned, skipping"${CL_RST}
+ exit 1;
+ fi
+ fi
+
+ [ $QUIET ] || echo -e ${CL_YLW}"Certificate:${CL_RST} $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 -e ${CL_GRN}"Crushing${CL_RST} $x"
+ optimize_png $x
+ done
+ cp $BASE/$1 $BASE/$1.old
+
+ [ $QUIET ] || echo -e ${CL_GRN}"Repacking apk.."${CL_RST}
+ aapt p -0 .dat -0 .dict -0 .arsc -F $NAME .
+
+ [ $QUIET ] || echo -e ${CL_GRN}"Resigning with cert:${CL_RST} `echo -e $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 -e ${CL_GRN}"Zipalign.."${CL_RST}
+ 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 -e "Usage: $0 [apk file]"
+fi
diff --git a/utils/squisher b/utils/squisher
new file mode 100755
index 0000000..95d8885
--- /dev/null
+++ b/utils/squisher
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Squish a CM otapackage for distribution
+# cyanogen
+
+. $ANDROID_BUILD_TOP/vendor/aosp/utils/colors
+
+OUT_TARGET_HOST=`uname -s`
+if [ x"$OUT_TARGET_HOST" = x"Linux" ]
+then
+ OUT_TARGET_HOST=linux-x86
+ XARGS="xargs --max-args=1 --max-procs `grep 'processor' /proc/cpuinfo|wc -l`"
+elif [ x"$OUT_TARGET_HOST" = x"Darwin" ]
+then
+ OUT_TARGET_HOST=darwin-x86
+ XARGS="xargs -n 1 -P `sysctl hw.ncpu | awk '{print $2}'`"
+else
+ echo -e $${CL_RED}"ERROR: unknown/unsupported host OS!"${CL_RST}
+ exit 1
+fi
+
+if [ -z "$OUT" -o ! -d "$OUT" ]; then
+ echo -e ${CL_RED}"ERROR: $0 only works with a full build environment. $OUT should exist."${CL_RST}
+ exit 1
+fi
+
+OPTICHARGER=$ANDROID_BUILD_TOP/vendor/aosp/utils/opticharger
+QUIET=-q
+DELETE_BINS="applypatch applypatch_static check_prereq recovery updater"
+
+# Optimize PNG resources in APKs
+( cd $OUT/system; find framework/ app/ priv-app/ vendor/app/ -name \*.apk -print | $XARGS $OPTICHARGER; )
+
+exit 0