remove libgps

readd cache initscript and remove cache hacks from initrd
add softbuttons prop to build.prop
integrate apps removal in squisher

Android.mk

@@ -17,8 +17,7 @@ ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),htcleo)
 LOCAL_PATH := $(my-dir)
 subdir_makefiles := \
 	$(LOCAL_PATH)/libsensors/Android.mk \
-	$(LOCAL_PATH)/liblights/Android.mk \
-	$(LOCAL_PATH)/libgps/Android.mk
+	$(LOCAL_PATH)/liblights/Android.mk
 
 include $(subdir_makefiles)
 

leo.mk

@@ -101,6 +101,7 @@ PRODUCT_COPY_FILES += \
 # This file is used to install the enable RMNET and corresponding modules which dont get activated by normal module script, mount cache so that downloads work correctly
 PRODUCT_COPY_FILES += \
 	device/htc/leo/prebuilt/init.d/01modules:system/etc/init.d/01modules \
+	device/htc/leo/prebuilt/init.d/02cache:system/etc/init.d/02cache \
 	device/htc/leo/prebuilt/init.d/10mic_level:system/etc/init.d/10mic_level \
 	device/htc/leo/prebuilt/init.d/97ppp:system/etc/init.d/97ppp
 
@@ -140,7 +141,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	camera.qsd8k \
 	leo-reference-ril \
-	libgps \
 	libhtc_ril_wrapper
 	
 # Omx cli test apps

overlay/frameworks/base/core/res/res/values/dimens.xml

@@ -1,4 +1,4 @@
 <resources>
     <!-- Height of the horizontal navigation bar on devices that require it -->
-    <dimen name="navigation_bar_height">42dp</dimen>
+    <dimen name="navigation_bar_height">38dp</dimen>
 </resources>

prebuilt/init.d/02cache

@@ -0,0 +1,11 @@
+#!/system/bin/sh
+
+cache_partition=`grep cache /proc/mtd | cut -d: -f1 | sed 's/mtd/mtdblock/'`
+
+umount /cache
+rmdir /cache
+mkdir /mnt/cache
+mkdir /data/cache
+mount -t yaffs2 -o rw /dev/block/$cache_partition /mnt/cache
+ln -s /data/cache /cache
+ln -s /mnt/cache/recovery /cache/recovery

prebuilt/init.htcleo.rc

@@ -11,18 +11,6 @@ on early-init
 on fs
     mount yaffs2 mtd@system /system remount
 
-    # cache hacks
-    mount yaffs2 mtd@cache /mnt/cache nosuid nodev remount
-    mount yaffs2 mtd@userdata /data nosuid nodev
-
-    rmdir /cache
-
-    mkdir /data/cache 0771 system cache
-    symlink /data/cache /cache
-
-    mkdir /mnt/cache/recovery 0770 system cache
-    symlink /mnt/cache/recovery /cache/recovery
-
 on post-fs-data
 
     mount rootfs rootfs / remount

releasetools/apps.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-# This script is included in squisher
-# use to remove unwanted stuff in the otapackage
-
-echo "Leo has limited diskspace!"
-echo "Removing unwanted stuff..."
-
-rm -rf $REPACK/ota/system/media/video
-
-cd $REPACK/ota/system/app
-
-rm VideoEditor.apk
-rm RomManager.apk
-rm LiveWallpapers.apk
-rm Galaxy4.apk
-rm HoloSpiralWallpaper.apk
-rm MagicSmokeWallpapers.apk
-rm PhaseBeam.apk

releasetools/squisher

@@ -83,8 +83,21 @@ cd $REPACK/ota
 printf "Unpacking $OTAPACKAGE..."
 unzip $QUIET $OTAPACKAGE
 
-# Apps removal script
-. $ANDROID_BUILD_TOP/device/htc/leo/releasetools/apps.sh
+# leo apps removal
+printf "Leo has limited diskspace!"
+printf "Removing unwanted stuff..."
+
+rm -rf $REPACK/ota/system/media/video
+
+cd $REPACK/ota/system/app
+
+rm VideoEditor.apk
+rm RomManager.apk
+rm LiveWallpapers.apk
+rm Galaxy4.apk
+rm HoloSpiralWallpaper.apk
+rm MagicSmokeWallpapers.apk
+rm PhaseBeam.apk
 
 echo
 cd $REPACK/ota/system/framework

system.prop

@@ -1,2 +1,5 @@
 rild.libpath=/system/lib/libhtc_ril_wrapper.so
-rild.libargs=-d /dev/smd0
+rild.libargs=-d /dev/smd0
+#
+# uncomment prop below to enable softbuttons
+#qemu.hw.mainkeys=0