summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rootdir/Android.mk8
-rw-r--r--rootdir/etc/init.camera.rc26
-rw-r--r--rootdir/etc/init.sony.rc23
-rw-r--r--shinano.mk1
4 files changed, 23 insertions, 35 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index af4fe71..9066464 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -41,14 +41,6 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE := init.sony.rc
-LOCAL_MODULE_TAGS := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/init.sony.rc
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := init.sony.usb.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
diff --git a/rootdir/etc/init.camera.rc b/rootdir/etc/init.camera.rc
index b309f43..ae8a21f 100644
--- a/rootdir/etc/init.camera.rc
+++ b/rootdir/etc/init.camera.rc
@@ -21,6 +21,17 @@ on early-fs
class_start trimarea
exec u:r:qti_init_shell:s0 -- /sbin/wait4tad_static
+on fs
+ # SONY: create mount point for idd
+ mkdir /idd 0751 system system
+
+ # SONY: setup idd partition
+ chown system system /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 early-boot
#SONY early boot
start ta_qmi_service
@@ -72,6 +83,12 @@ on post-fs-data
setprop init.taimport.ready true
# taimport ready, use this as trigger for multi-cdf-symlinker
+ # SONY: IDD
+ mkdir /idd/lost+found 0770 root root
+ mkdir /idd/output 0755 system system
+ mkdir /idd/socket 0711 system system
+ restorecon_recursive /idd
+
service taimport /vendor/bin/taimport
class late_start
user root
@@ -127,13 +144,11 @@ on property:init.svc.servicemanager=restarting
# SONY: TrimArea Daemon
# Last 2 args: start block(blk size 128k), number of blocks(partitionsize(kb)/128(kb))
service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16
-#service tad_static /sbin/tad_static /data/credmgr/ta_part.bin 0,16
class core
user system
group system root camera media
socket tad stream 0770 system system
-
-# tad_static is in rootfs, normal file_context does not work
+ # tad_static is in rootfs, normal file_context does not work
seclabel u:r:tad:s0
service updatemiscta /vendor/bin/updatemiscta
@@ -141,3 +156,8 @@ service updatemiscta /vendor/bin/updatemiscta
user system
group system
oneshot
+
+service iddd /vendor/bin/iddd
+ class main
+ user system
+ group system log inet cameraserver media
diff --git a/rootdir/etc/init.sony.rc b/rootdir/etc/init.sony.rc
deleted file mode 100644
index 6d548f5..0000000
--- a/rootdir/etc/init.sony.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file includes specific init configs used by Sony devices
-
-on fs
- # SONY: create mount point for idd
- mkdir /idd 0751 system system
-
- # SONY: setup idd partition
- chown system system /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 /idd/lost+found 0770 root root
- mkdir /idd/output 0755 system system
- mkdir /idd/socket 0711 system system
- restorecon_recursive /idd
-
-service iddd /vendor/bin/iddd
- class main
- user system
- group system log inet cameraserver media
diff --git a/shinano.mk b/shinano.mk
index 21b58c8..4459b83 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -146,7 +146,6 @@ PRODUCT_PACKAGES += \
init.qcom.power.rc \
init.qcom.rc \
init.recovery.qcom.rc \
- init.sony.rc \
init.sony.usb.rc \
ueventd.qcom.rc