shinano: Move idd to proprietary sony rc

Change-Id: I63c28db08b4a21c071a93e1b459071d253560f92

4 files changed, 27 insertions, 31 deletions

diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index 90630fa..f85e4c6 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -24,23 +24,11 @@ on init
 :/system/vendor/lib/libwvm.so|libdtcpipplayer.so \
 "
 
-	mkdir /idd 0751 idd idd
-	mkdir /rca 0750 idd idd
-
 on early-fs
     wait /dev/block/mmcblk0p1
     class_start trimarea
     exec u:r:qti_init_shell:s0 -- /sbin/wait4tad_static
 
-on fs
-    # mount apps_log
-    #wait /dev/block/platform/msm_sdcc.1/by-name/apps_log
-    #mount ext4 /dev/block/platform/msm_sdcc.1/by-name/apps_log /idd nosuid nodev noatime noexec barrier=0 discard
-    chown idd idd /idd
-    chmod 0751 /idd
-    #exec /system/bin/rm -r /idd/lost+found
-    symlink /idd /mnt/idd
-
 on early-boot
     #SONY early boot
     start ta_qmi_service
@@ -79,13 +67,6 @@ on post-fs-data
     # SONY: Create dir for Widevine keybox
     mkdir /data/persist/wv 0700 system system
 
-    mkdir /idd/lost+found 0770 root root
-    mkdir /idd/output 0755 idd idd
-    mkdir /idd/socket 0711 idd idd
-    mkdir /idd/startup-prober 0700 root root
-
-    restorecon_recursive /idd
-
     # SONY: Camera
     mkdir /data/camera 0770 media camera
     chown media camera /sys/devices/sony_camera_0/info
@@ -108,11 +89,6 @@ service taimport /system/bin/taimport
     group system
     oneshot
 
-service iddd /system/bin/iddd
-    class main
-    user idd
-    group idd log inet
-
 # This script init /cache/CredentialManagerData if /data/credmgr doesn't meet our requirements
 service initcredmgr /system/bin/credmgrfirstboot.sh
     class late_start
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 7316d4c..f06cafd 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -15,9 +15,10 @@
 # limitations under the License.
 #
 
-import /init.platform-common.rc
-import /init.sony.usb.rc
 import /init.qcom.power.rc
+import /init.sony.rc
+import /init.sony.usb.rc
+import /init.platform-common.rc
 import /init.camera.rc
 
 on early-init
@@ -371,11 +372,6 @@ on post-fs-data
     mkdir /data/pc 0600 radio radio
     mkdir /cache/pc 0770 radio system
 
-    exec u:r:qti_init_shell:s0 -- /system/bin/rm -r /idd/lost+found
-    mkdir /idd/lost+found 0770 root root
-    mkdir /idd/output 0755 idd idd
-    mkdir /idd/socket 0711 idd idd
-    restorecon_recursive /idd
     start wvkbd_installer
 
 on property:bluetooth.isEnabled=true
diff --git a/rootdir/init.sony.rc b/rootdir/init.sony.rc
new file mode 100644
index 0000000..7d450af
--- /dev/null
+++ b/rootdir/init.sony.rc
@@ -0,0 +1,23 @@
+# This file includes specific init configs used by Sony devices
+
+on fs
+    # SONY: create mount point for idd
+    mkdir /idd 0751 idd idd
+
+    # SONY: setup idd partition
+    chown idd idd /idd
+    chmod 0751 /idd
+    exec u:r:qti_init_shell:s0 -- /system/bin/rm -r /idd/lost+found
+    symlink /idd /mnt/idd
+    restorecon_recursive   /idd
+
+on-post-fs-data
+    mkdir /mnt/idd/lost+found 0770 root root
+    mkdir /mnt/idd/output 0755 idd idd
+    mkdir /mnt/idd/socket 0711 idd idd
+    restorecon_recursive /mnt/idd
+
+service iddd /system/bin/iddd
+    class main
+    user idd
+    group idd log inet trimarea
\ No newline at end of file
diff --git a/shinano.mk b/shinano.mk
index 0b7ef9f..6dc1979 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -43,6 +43,7 @@ PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/rootdir/init.qcom.rc:root/init.qcom.rc \
     $(COMMON_PATH)/rootdir/init.camera.rc:root/init.camera.rc \
     $(COMMON_PATH)/rootdir/init.platform-common.rc:root/init.platform-common.rc \
+    $(COMMON_PATH)/rootdir/init.sony.rc:root/init.sony.rc \
     $(COMMON_PATH)/rootdir/init.qcom.power.rc:root/init.qcom.power.rc \
     $(COMMON_PATH)/rootdir/init.recovery.qcom.rc:root/init.recovery.qcom.rc \
     $(COMMON_PATH)/rootdir/init.sony.usb.rc:root/init.sony.usb.rc \