From 766ec076b39e99446b746c61ae88d70f71fb29f6 Mon Sep 17 00:00:00 2001 From: milaq Date: Wed, 2 May 2012 15:50:47 +0200 Subject: [PATCH] remove libgps readd cache initscript and remove cache hacks from initrd add softbuttons prop to build.prop integrate apps removal in squisher --- Android.mk | 3 +-- leo.mk | 2 +- .../base/core/res/res/values/dimens.xml | 2 +- prebuilt/init.d/02cache | 11 +++++++++++ prebuilt/init.htcleo.rc | 12 ------------ releasetools/apps.sh | 18 ------------------ releasetools/squisher | 17 +++++++++++++++-- system.prop | 5 ++++- 8 files changed, 33 insertions(+), 37 deletions(-) create mode 100755 prebuilt/init.d/02cache delete mode 100755 releasetools/apps.sh diff --git a/Android.mk b/Android.mk index 7835fcf..102301f 100644 --- a/Android.mk +++ b/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) diff --git a/leo.mk b/leo.mk index f8cc1e0..0469783 100644 --- a/leo.mk +++ b/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 diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml index f4a85f4..7319b52 100755 --- a/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -1,4 +1,4 @@ - 42dp + 38dp \ No newline at end of file diff --git a/prebuilt/init.d/02cache b/prebuilt/init.d/02cache new file mode 100755 index 0000000..f8bbba2 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/prebuilt/init.htcleo.rc b/prebuilt/init.htcleo.rc index d353bcd..9e3d617 100644 --- a/prebuilt/init.htcleo.rc +++ b/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 diff --git a/releasetools/apps.sh b/releasetools/apps.sh deleted file mode 100755 index 04fb81d..0000000 --- a/releasetools/apps.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/releasetools/squisher b/releasetools/squisher index cfb4f83..1bf1d77 100755 --- a/releasetools/squisher +++ b/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 diff --git a/system.prop b/system.prop index 180f91c..8bae65f 100755 --- a/system.prop +++ b/system.prop @@ -1,2 +1,5 @@ rild.libpath=/system/lib/libhtc_ril_wrapper.so -rild.libargs=-d /dev/smd0 \ No newline at end of file +rild.libargs=-d /dev/smd0 +# +# uncomment prop below to enable softbuttons +#qemu.hw.mainkeys=0 \ No newline at end of file