Merge remote-tracking branch 'cm/cm-12.1' into HEADHEADlp5.1

Change-Id: I9c576e7dc7ab4679cb4f7aff937fe76ed2a0f035

4 files changed, 13 insertions, 127 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 80361da..5be93e6 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,7 +22,7 @@ DEVICE_FOLDER := device/amazon/otterx
 
 # Kernel
 BOARD_KERNEL_PAGESIZE := 4096
-BOARD_KERNEL_CMDLINE := mem=512M androidboot.selinux=permissive newbootargs
+BOARD_KERNEL_CMDLINE := mem=512M newbootargs
 TARGET_BOOTLOADER_BOARD_NAME := otterx
 TARGET_OTA_ASSERT_DEVICE := otterx
 
@@ -41,9 +41,7 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 801112064
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 6083296830
 
 # Recovery
-TARGET_RECOVERY_INITRC := $(DEVICE_FOLDER)/init.recovery.rc
-BOARD_ALWAYS_INSECURE := true
-TW_INTERNAL_STORAGE_PATH := "/data/media"
+TW_INTERNAL_STORAGE_PATH := "/data/media/0"
 TW_INTERNAL_STORAGE_MOUNT_POINT := "data"
 BOARD_HAS_NO_REAL_SDCARD := true
 RECOVERY_SDCARD_ON_DATA := true
diff --git a/device.mk b/device.mk
index 7bffd0b..c7fcb97 100644
--- a/device.mk
+++ b/device.mk
@@ -31,6 +31,7 @@ PRODUCT_COPY_FILES += \
     $(DEVICE_FOLDER)/fstab.otterx:/root/fstab.otterx \
     $(DEVICE_FOLDER)/init.otterx.rc:/root/init.otterx.rc \
     $(DEVICE_FOLDER)/init.otterx.usb.rc:/root/init.otterx.usb.rc \
+    $(DEVICE_FOLDER)/init.recovery.otterx.rc:/root/init.recovery.otterx.rc \
     $(DEVICE_FOLDER)/ueventd.otterx.rc:/root/ueventd.otterx.rc
 
 # Prebuilt system/bin
@@ -51,15 +52,6 @@ ADDITIONAL_BUILD_PROPERTIES += \
     usb.product.adb=0006 \
     usb.product.mtpadb=0006
 
-# Low-RAM optimizations
-ADDITIONAL_BUILD_PROPERTIES += \
-    ro.config.low_ram=true \
-    persist.sys.force_highendgfx=true \
-    dalvik.vm.jit.codecachesize=0 \
-    config.disable_atlas=true \
-    ro.config.max_starting_bg=8 \
-    ro.sys.fw.bg_apps_limit=16
-
 # Dalvik settings
 ADDITIONAL_BUILD_PROPERTIES += \
     dalvik.vm.heapstartsize=5m \
diff --git a/init.recovery.otterx.rc b/init.recovery.otterx.rc
new file mode 100644
index 0000000..686e2f3
--- /dev/null
+++ b/init.recovery.otterx.rc
@@ -0,0 +1,10 @@
+on early-init
+    loglevel 7
+
+on fs
+# compatibility w/ 2.6 kernels
+    symlink /dev/block/platform/omap/omap_hsmmc.1 /dev/block/platform/mmci-omap-hs.1
+
+on boot
+    write /sys/class/android_usb/android0/idVendor 1949
+    write /sys/class/android_usb/android0/idProduct 0006
diff --git a/init.recovery.rc b/init.recovery.rc
deleted file mode 100644
index f76c253..0000000
--- a/init.recovery.rc
+++ /dev/null
@@ -1,114 +0,0 @@
-import /init.recovery.${ro.hardware}.rc
-
-on early-init
-    start ueventd
-    start healthd
-
-on init
-    export PATH /sbin:/system/bin
-    export LD_LIBRARY_PATH .:/sbin
-    export ANDROID_ROOT /system
-    export ANDROID_DATA /data
-    export EXTERNAL_STORAGE /sdcard
-
-    symlink /system/etc /etc
-
-    mkdir /boot
-    mkdir /recovery
-    mkdir /sdcard
-    mkdir /internal_sd
-    mkdir /external_sd
-    mkdir /sd-ext
-    mkdir /datadata
-    mkdir /emmc
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mount tmpfs tmpfs /tmp
-
-    chown root shell /tmp
-    chmod 0775 /tmp
-
-    mkdir /mnt 0775 root system
-    mkdir /storage 0050 root sdcard_r
-    mount tmpfs tmpfs /storage mode=0050,uid=0,gid=1028
-
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell 0700 shell shell
-
-    # Directory for putting things only root should see.
-    mkdir /mnt/secure 0700 root root
-
-    # Create private mountpoint so we can MS_MOVE from staging
-    mount tmpfs tmpfs /mnt/secure mode=0700,uid=0,gid=0
-
-    # Directory for staging bindmounts
-    mkdir /mnt/secure/staging 0700 root root
-
-    # Fuse public mount points.
-    mkdir /mnt/fuse 0700 root system
-    mount tmpfs tmpfs /mnt/fuse mode=0775,gid=1000
-
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 1949
-    write /sys/class/android_usb/android0/idProduct 0004
-    write /sys/class/android_usb/android0/functions adb
-    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
-    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
-    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-
-
-# compatibility w/ 2.6 kernels
-    symlink /dev/block/platform/omap/omap_hsmmc.1 /dev/block/platform/mmci-omap-hs.1
-
-on boot
-
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-    class_start default
-
-on property:sys.powerctl=*
-   powerctl ${sys.powerctl}
-
-on property:sys.storage.ums_enabled=1
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/functions adb,mass_storage
-    write /sys/class/android_usb/android0/enable 1
-
-on property:sys.storage.ums_enabled=0
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/functions adb
-    write /sys/class/android_usb/android0/enable ${service.adb.root}
-
-service ueventd /sbin/ueventd
-    critical
-
-service healthd /sbin/healthd -n
-    critical
-
-service recovery /sbin/recovery
-
-service setup_adbd /sbin/setup_adbd
-    oneshot
-
-service adbd /sbin/adbd recovery
-    disabled
-    socket adbd stream 660 system system
-
-service vold /sbin/minivold
-    socket vold stream 0660 root mount
-    ioprio be 2
-
-# Always start adbd on userdebug and eng builds
-on property:ro.debuggable=1
-    #write /sys/class/android_usb/android0/enable 1
-    #start adbd
-    setprop service.adb.root 1
-
-# Restart adbd so it can run as root
-on property:service.adb.root=1
-    write /sys/class/android_usb/android0/enable 0
-    restart adbd
-    write /sys/class/android_usb/android0/enable 1