From 28787caa5363aff7c068198a3ae3de4655c4771e Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Mon, 12 Dec 2011 01:00:07 +0000
Subject: [PATCH] leo: add releasetools back in, and make it compatible with
 new cm, and update squisher script to master file, changed another typo from
 cyanogen to cm

---
 BoardConfig.mk        | 2 +-
 cm.mk                 | 3 ++-
 releasetools/squisher | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 36b1ef4..5a9872d 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -74,7 +74,7 @@ BOARD_USE_KINETO_COMPATIBILITY := true
 #BOARD_HAVE_FM_RADIO := true
 #BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
 
-#TARGET_CUSTOM_RELEASETOOL := device/htc/leo/releasetools/squisher
+TARGET_CUSTOM_RELEASETOOL := device/htc/leo/releasetools/squisher
 
 # # cat /proc/mtd
 # dev:    size   erasesize  name
diff --git a/cm.mk b/cm.mk
index 382965f..8f21c36 100644
--- a/cm.mk
+++ b/cm.mk
@@ -27,5 +27,6 @@ PRODUCT_PACKAGES += \
 # Release name and versioning
 PRODUCT_RELEASE_NAME := Leo
 PRODUCT_VERSION_DEVICE_SPECIFIC := -aali
--include vendor/cyanogen/products/common_versions.mk
+
+-include vendor/cm/products/common_versions.mk
 
diff --git a/releasetools/squisher b/releasetools/squisher
index ab9091e..be1b7c1 100755
--- a/releasetools/squisher
+++ b/releasetools/squisher
@@ -25,6 +25,8 @@ 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
 else
     OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
 fi
@@ -33,7 +35,7 @@ if [ ! -f "$OTAPACKAGE" ]; then
 	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"
 
@@ -124,7 +126,7 @@ $SED -i \
 	$REPACK/ota/system/build.prop
 
 # Include device specific script
-if [ "$TARGET_PRODUCT" = "cyanogen_leo" ]; then
+if [ "$TARGET_PRODUCT" = "cm_leo" ]; then
         . $ANDROID_BUILD_TOP/device/htc/leo/releasetools/squisher.sh
 fi