CM9: initial CM vendor setup for Android 4
diff --git a/tools/opticharger b/tools/opticharger
index b4345c4..c8c86f5 100755
--- a/tools/opticharger
+++ b/tools/opticharger
@@ -20,10 +20,20 @@
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"
+ fi
+
APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$USER/META/apkcerts.txt
if [ ! -f "$APKCERTS" ];
then
@@ -40,7 +50,7 @@
if [ "$(which pngcrush)" != "" ];
then
optimize_png () {
- pngcrush -q -brute $1 ${1}.out 1> /dev/null 2> /dev/null
+ pngcrush -q ${BRUTECRUSH} $1 ${1}.out 1> /dev/null 2> /dev/null
mv ${1}.out ${1}
}
elif [ "$(which optipng)" != "" ];
diff --git a/tools/squisher b/tools/squisher
index c82443f..b511936 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -25,6 +25,8 @@
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
else
OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
fi
@@ -33,7 +35,7 @@
exit 1
fi
-OPTICHARGER=$ANDROID_BUILD_TOP/vendor/cyanogen/tools/opticharger
+OPTICHARGER=$ANDROID_BUILD_TOP/vendor/cm/tools/opticharger
QUIET=-q
DELETE_BINS="applypatch applypatch_static check_prereq recovery updater"