From 3330d436df9eba7096c3d7647ff60a871d1591f5 Mon Sep 17 00:00:00 2001 From: Alexander Diewald Date: Sat, 11 Nov 2017 21:33:54 +0100 Subject: shinano: init: Adjust vendor service path. * In order to be compliant with the proprietary file locations, adjust the path to the binaries in the init files. The blob binaries have been moved from "/system/bin" to "/system/vendor/bin" * The idea behind the move is to profit from qcom's sepolicy file labelling. Change-Id: I78b96730638258ffd54640f7951ceebc7f503fc4 Signed-off-by: Alexander Diewald --- rootdir/init.camera.rc | 27 ++++++++++++++------------- rootdir/init.qcom.rc | 30 +++++++++++++++--------------- rootdir/init.sony.rc | 2 +- sepolicy/file_contexts | 2 +- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc index 5ed04a6..f7d45fe 100644 --- a/rootdir/init.camera.rc +++ b/rootdir/init.camera.rc @@ -15,12 +15,12 @@ # on init - export LD_SHIM_LIBS " \ -/system/bin/credmgrd|libshims_signal.so \ -:/system/bin/iddd|libshims_idd.so \ -:/system/bin/suntrold|libshims_signal.so \ +export LD_SHIM_LIBS " \ +:/system/vendor/bin/credmgrd|libshims_signal.so \ +:/system/vendor/bin/iddd|libshims_idd.so \ +:/system/vendor/bin/suntrold|libshims_signal.so \ :/system/lib/hw/camera.qcom.so|libsonycamera.so \ -:/system/bin/mm-qcamera-daemon|libandroid.so \ +:/system/vendor/bin/mm-qcamera-daemon|libandroid.so \ :/system/lib/libcammw.so|libsensor.so \ :/system/lib/libsomc_chokoballpal.so|libGraphicBuffer.so \ :/system/lib/hw/camera.qcom.so|libsensor.so \ @@ -64,7 +64,7 @@ on post-fs-data on post-fs-data # SONY: Start early TA-users mkdir /data/etc 0755 root shell - exec -- /system/bin/taimport + exec -- /system/vendor/bin/taimport # SONY: Create dir for Widevine keybox mkdir /data/persist/wv 0700 system system @@ -106,19 +106,19 @@ on property:sys.credmgrdready=true start credmgrd # Start Credential manager daemon -service credmgrd /system/bin/credmgrd +service credmgrd /system/vendor/bin/credmgrd user system group system camera media socket credmgr stream 0660 system camera disabled # Secure Config Transfer service -service sct_service /system/bin/sct_service +service sct_service /system/vendor/bin/sct_service user root disabled # Trim Area QMI service -service ta_qmi_service /system/bin/ta_qmi_service +service ta_qmi_service /system/vendor/bin/ta_qmi_service user system group system root net_raw wakelock disabled @@ -128,8 +128,8 @@ service scd /system/bin/scd user system group system -#service wvkbd_installer /system/bin/logwrapper /system/bin/wvkbd -service wvkbd_installer /system/bin/wvkbd +#service wvkbd_installer /system/bin/logwrapper /system/vendor/bin/wvkbd +service wvkbd_installer /system/vendor/bin/wvkbd user system group system oneshot @@ -142,7 +142,7 @@ on property:sys.listeners.registered=true start wvkbd_installer #service qcamerasvr /system/bin/logwrapper /system/bin/mm-qcamera-daemon -service qcamerasvr /system/bin/mm-qcamera-daemon +service qcamerasvr /system/vendor/bin/mm-qcamera-daemon class late_start user camera group camera media system inet input graphics @@ -159,7 +159,8 @@ service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16 # tad_static is in rootfs, normal file_context does not work seclabel u:r:tad:s0 -service updatemiscta /system/bin/updatemiscta + +service updatemiscta /system/vendor/bin/updatemiscta class main user system group system diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 61c46a4..9d020d6 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -384,18 +384,18 @@ on property:bluetooth.isEnabled=true write /sys/class/bluetooth/hci0/idle_timeout 7000 # QMUX must be in multiple groups to support external process connections -service qmuxd /system/bin/qmuxd +service qmuxd /system/vendor/bin/qmuxd class main user root group radio audio bluetooth gps nfc diag wakelock oem_2950 # Wi-Fi and BT MAC addresses -service macaddrsetup /system/bin/macaddrsetup /sys/devices/platform/bcmdhd_wlan/macaddr +service macaddrsetup /system/vendor/bin/macaddrsetup /sys/devices/platform/bcmdhd_wlan/macaddr class late_start user root oneshot -service netmgrd /system/bin/netmgrd +service netmgrd /system/vendor/bin/netmgrd class late_start user root group root wifi wakelock radio inet system @@ -404,7 +404,7 @@ on property:ro.radio.noril=true stop ril-daemon stop netmgrd -service qseecomd /system/bin/qseecomd +service qseecomd /system/vendor/bin/qseecomd class core user root group drmrpc root @@ -459,45 +459,45 @@ service loc_launcher /system/vendor/bin/loc_launcher group gps inet net_raw oem_2950 net_admin wifi # Start suntrold -service suntrold /system/bin/suntrold +service suntrold /system/vendor/bin/suntrold user system group system camera oneshot class main # Modem Log QMI service -service mlog_qmi_service /system/bin/mlog_qmi_service - class late_start +service mlog_qmi_service /system/vendor/bin/mlog_qmi_service + class late_start user root # Thermal Manager service -service thermanager /system/bin/thermanager /system/etc/thermanager.xml +service thermanager /system/vendor/bin/thermanager /system/vendor/etc/thermanager.xml class main user root group root -service irsc_util /system/bin/irsc_util "/etc/sec_config" +service irsc_util /system/vendor/bin/irsc_util "/system/vendor/etc/sec_config" class main user root oneshot -service rmt_storage /system/bin/rmt_storage +service rmt_storage /system/vendor/bin/rmt_storage class core user root group system wakelock -service sensors /system/bin/sensors.qcom +service sensors /system/vendor/bin/sensors.qcom class core user root group root wakelock -service qcom-sensor-sh /system/bin/sh /system/etc/init.qcom-sensor.sh +service qcom-sensor-sh /system/bin/sh /system/vendor/etc/init.qcom-sensor.sh class main user root oneshot # HexagonDSP FastRPC daemon -service adsprpcd /system/bin/adsprpcd +service adsprpcd /system/vendor/bin/adsprpcd class main user media group media @@ -538,7 +538,7 @@ service mediadrm /system/bin/mediadrmserver group mediadrm drmrpc ioprio rt 4 -service mpdecision /system/bin/mpdecision --avg_comp +service mpdecision /system/vendor/bin/mpdecision --avg_comp class main user root group root readproc @@ -552,7 +552,7 @@ service mpdecision /system/bin/mpdecision --avg_comp seclabel u:r:uim:s0 # OSS time -service timekeep /system/bin/timekeep restore +service timekeep /system/vendor/bin/timekeep restore class late_start user root group root diff --git a/rootdir/init.sony.rc b/rootdir/init.sony.rc index 5748b19..0902fd2 100644 --- a/rootdir/init.sony.rc +++ b/rootdir/init.sony.rc @@ -17,7 +17,7 @@ on post-fs-data mkdir /idd/socket 0711 system system restorecon_recursive /idd -service iddd /system/bin/iddd +service iddd /system/vendor/bin/iddd class main user system group system log inet cameraserver media diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 24fab9d..8a26f5e 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -6,7 +6,7 @@ /system/bin/tfa9890_amp u:object_r:tfa_amp_exec:s0 # Modem -/system/bin/mlog_qmi_service u:object_r:mlog_qmi_exec:s0 +/system/vendor/bin/mlog_qmi_service u:object_r:mlog_qmi_exec:s0 # Hardware tunables /sys/devices/virtual/timed_output/vibrator/vtg_level -- u:object_r:sysfs_vibrator:s0 -- cgit v1.2.3