Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread

etc/init.htc.rc

@@ -1,59 +0,0 @@
-on early-init
-    start ueventd
-
-on init
-    export PATH /sbin
-    export ANDROID_ROOT /system
-    export ANDROID_DATA /data
-    export EXTERNAL_STORAGE /sdcard
-
-    symlink /system/etc /etc
-
-    mkdir /boot
-    mkdir /sdcard
-    mkdir /sd-ext
-    mkdir /datadata
-    mkdir /emmc
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mount /tmp /tmp tmpfs
-
-on boot
-
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-    class_start default
-
-service ueventd /sbin/ueventd
-    critical
-
-service choice_fn /sbin/choice_fn
-    oneshot
-
-service recovery /sbin/recovery
-
-service power_test /sbin/power_test
-    disabled
-    oneshot
-
-service offmode_charging /sbin/offmode_charging
-    disabled
-    oneshot
-
-service detect_key /sbin/detect_key
-    disabled
-    oneshot
-
-service htcbatt /sbin/htcbatt
-    oneshot
-
-service adbd /sbin/adbd recovery
-
-on property:persist.service.adb.enable=1
-    start adbd
-
-on property:persist.service.adb.enable=0
-    stop adbd

utilities/Android.mk

@@ -59,50 +59,5 @@ LOCAL_SRC_FILES := ../../../$(BOARD_MKE2FS)
 endif
 include $(BUILD_PREBUILT)
 
-ifeq ($(BOARD_USES_RECOVERY_CHARGEMODE),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := choice_fn
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := power_test
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := offmode_charging
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := detect_key
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := htcbatt
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-ifeq ($(BOARD_HTCBATT),)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-else
-LOCAL_SRC_FILES := ../../../$(BOARD_HTCBATT)
-endif
-include $(BUILD_PREBUILT)
-endif
 
 endif