Add servicemanager

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 91eed58dba745048bb9345b9d384135ee907bea0..8bb177c78b0c4a42003c0cdd1a106e18dfc83e87 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -77,7 +77,6 @@ TARGET_COPY_OUT_VENDOR := vendor
 
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
-TARGET_KEYMASTER_WAIT_FOR_QSEE := true
 TARGET_CRYPTFS_HW_PATH := $(BOARD_PATH)/cryptfs_hw
 
 # Recovery
@@ -118,3 +117,5 @@ TW_EXCLUDE_DEFAULT_USB_INIT := true
 TW_NO_USB_STORAGE := true
 TW_SCREEN_BLANK_ON_BOOT := true
 TW_INCLUDE_CRYPTO := true
+TW_EXCLUDE_MTP := true
+BOARD_SUPPRESS_SECURE_ERASE := true
\ No newline at end of file

diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc
index e4f2bdec68de05fd41b921794a458cc4cb47054a..2ca4fd82f1f1f7ee48eabd302e17e47f60fd7e63 100644 (file)
--- a/recovery/root/init.recovery.qcom.rc
+++ b/recovery/root/init.recovery.qcom.rc
@@ -25,12 +25,43 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# encryption support
+service servicemanager /sbin/servicemanager
+    disabled
+    user root
+    group root readproc
+    seclabel u:r:recovery:s0
+    writepid /dev/cpuset/system-background/tasks
+
+service keystore /sbin/keystore /data/misc/keystore
+    disabled
+    user root
+    group root drmrpc readproc
+    seclabel u:r:recovery:s0
+    writepid /dev/cpuset/foreground/tasks
+
+service qseecomd /sbin/qseecomd
+    disabled
+    user root
+    group root
+    seclabel u:r:recovery:s0
+
+service servicemanager /sbin/servicemanager
+    disabled
+    user root
+    group root readproc
+    seclabel u:r:recovery:s0
+    writepid /dev/cpuset/system-background/tasks
+
 on init
+    setprop ro.hardware.keystore msm8998
+    setprop ro.hardware.gatekeeper msm8998
+    setprop ro.hardware.bootctrl msm8998
     chmod 0660 /dev/qseecom
     chown system drmrpc /dev/qseecom
     chmod 0664 /dev/ion
     chown system system /dev/ion
+    start qseecomd
+    start servicemanager
 
 on fs
     wait /dev/block/platform/soc/1da4000.ufshc
@@ -39,17 +70,11 @@ on fs
     chown system drmrpc /dev/qseecom
     chmod 0664 /dev/ion
     chown system system /dev/ion
-    export LD_LIBRARY_PATH /sbin:/vendor/lib64:/vendor/lib64/hw
     install_keyring
 
-service qseecomd /sbin/qseecomd
-    disabled
-    seclabel u:r:recovery:s0
-
 on boot
     # save battery by switching to interactive once booted
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
     write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
     write /sys/devices/system/cpu/cpu2/online 0
-    write /sys/devices/system/cpu/cpu3/online 0
-    start qseecomd
\ No newline at end of file
+    write /sys/devices/system/cpu/cpu3/online 0
\ No newline at end of file

diff --git a/recovery/root/sbin/servicemanager b/recovery/root/sbin/servicemanager
new file mode 100644 (file)
index 0000000..0b4a572
Binary files /dev/null and b/recovery/root/sbin/servicemanager differ