From 6d4ec7628c3fdec08b9008d45a60c97169e27626 Mon Sep 17 00:00:00 2001 From: Demon Singur Date: Sat, 12 May 2018 17:49:58 +0000 Subject: shinano-common: use /vendor for /system/vendor The /vendor symlink is available as soon as /system is mounted, just use /vendor. Change-Id: I2e92ed2abe225f1366cac418b13763bb5617f704 --- BoardConfigCommon.mk | 2 +- rootdir/bin/credmgrfirstboot.sh | 4 ++-- rootdir/etc/init.camera.rc | 24 ++++++++++++------------ rootdir/etc/init.qcom.rc | 32 ++++++++++++++++---------------- rootdir/etc/init.sony.rc | 2 +- shinano.mk | 2 +- system_prop.mk | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 86ca07d..e3bec4b 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -94,7 +94,7 @@ WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" # Shims TARGET_LD_SHIM_LIBS += \ - /system/lib/libsomc_chokoballpal.so|/system/vendor/lib/libshim_camera.so + /system/lib/libsomc_chokoballpal.so|/vendor/lib/libshim_camera.so # Filesystem BOARD_FLASH_BLOCK_SIZE := 131072 diff --git a/rootdir/bin/credmgrfirstboot.sh b/rootdir/bin/credmgrfirstboot.sh index 3b3ade9..ec99ca0 100755 --- a/rootdir/bin/credmgrfirstboot.sh +++ b/rootdir/bin/credmgrfirstboot.sh @@ -1,4 +1,4 @@ -#!/system/vendor/bin/sh +#!/vendor/bin/sh CREDFOLDER=/data/credmgr LOG=/cache/credmgr.log @@ -42,7 +42,7 @@ if [ "x$CREDMGRCNT" == "x0" ]; then chcon u:object_r:credmgrd_data_file:s0 $CREDFOLDER >> $LOG 2>&1 F_ERR $? "chcon $CREDFOLDER" echo "CREDINIT: cp initial file" >> $LOG 2>&1 - cp -v /system/vendor/CredentialManagerData /cache/CredentialManagerData >> $LOG 2>&1 + cp -v /vendor/CredentialManagerData /cache/CredentialManagerData >> $LOG 2>&1 F_ERR $? "copy CredentialManagerData" chown system:system /cache/CredentialManagerData >> $LOG 2>&1 F_ERR $? "chown CredentialManagerData" diff --git a/rootdir/etc/init.camera.rc b/rootdir/etc/init.camera.rc index eb1092c..11f0073 100644 --- a/rootdir/etc/init.camera.rc +++ b/rootdir/etc/init.camera.rc @@ -54,7 +54,7 @@ on post-fs-data on post-fs-data # SONY: Start early TA-users mkdir /data/etc 0755 root shell - exec -- /system/vendor/bin/taimport + exec -- /vendor/bin/taimport # SONY: Create dir for Widevine keybox mkdir /data/persist/wv 0700 system system @@ -68,18 +68,18 @@ on post-fs-data chmod 0660 /sys/devices/sony_camera_1/info # SONY: Import MiscTA to System properties - exec -- /system/vendor/bin/taimport property + exec -- /vendor/bin/taimport property setprop init.taimport.ready true # taimport ready, use this as trigger for multi-cdf-symlinker -service taimport /system/vendor/bin/taimport +service taimport /vendor/bin/taimport class late_start user root group system oneshot # This script init /cache/CredentialManagerData if /data/credmgr doesn't meet our requirements -service initcredmgr /system/vendor/bin/credmgrfirstboot.sh +service initcredmgr /vendor/bin/credmgrfirstboot.sh class late_start user root group root @@ -91,30 +91,30 @@ on property:sys.credmgrdready=true start credmgrd # Start Credential manager daemon -service credmgrd /system/vendor/bin/credmgrd +service credmgrd /vendor/bin/credmgrd user system group system camera media socket credmgr stream 0660 system camera disabled # Secure Config Transfer service -service sct_service /system/vendor/bin/sct_service +service sct_service /vendor/bin/sct_service user root disabled # Trim Area QMI service -service ta_qmi_service /system/vendor/bin/ta_qmi_service +service ta_qmi_service /vendor/bin/ta_qmi_service user system group system root net_raw wakelock disabled -service scd /system/vendor/bin/scd +service scd /vendor/bin/scd class late_start user system group system -#service wvkbd_installer /system/bin/logwrapper /system/vendor/bin/wvkbd -service wvkbd_installer /system/vendor/bin/wvkbd +#service wvkbd_installer /system/bin/logwrapper /vendor/bin/wvkbd +service wvkbd_installer /vendor/bin/wvkbd user system group system oneshot @@ -127,7 +127,7 @@ on property:sys.listeners.registered=true start wvkbd_installer #service qcamerasvr /system/bin/logwrapper /system/bin/mm-qcamera-daemon -service qcamerasvr /system/vendor/bin/mm-qcamera-daemon +service qcamerasvr /vendor/bin/mm-qcamera-daemon class late_start user camera group camera media system inet input graphics @@ -145,7 +145,7 @@ 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/vendor/bin/updatemiscta +service updatemiscta /vendor/bin/updatemiscta class main user system group system diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 1431a47..90e9e52 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -416,18 +416,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/vendor/bin/qmuxd +service qmuxd /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/vendor/bin/macaddrsetup /sys/devices/platform/bcmdhd_wlan/macaddr +service macaddrsetup /vendor/bin/macaddrsetup /sys/devices/platform/bcmdhd_wlan/macaddr class late_start user root oneshot -service netmgrd /system/vendor/bin/netmgrd +service netmgrd /vendor/bin/netmgrd class late_start user root group root wifi wakelock radio inet system @@ -437,12 +437,12 @@ on property:ro.radio.noril=true stop ril-daemon stop netmgrd -service qseecomd /system/vendor/bin/qseecomd +service qseecomd /vendor/bin/qseecomd class core user root group drmrpc root -service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \ +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \ -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi @@ -472,45 +472,45 @@ on property:persist.radio.multisim.config=dsds start ril-daemon2 # Start suntrold -service suntrold /system/vendor/bin/suntrold +service suntrold /vendor/bin/suntrold user system group system camera oneshot class main # Modem Log QMI service -service mlog_qmi_service /system/vendor/bin/mlog_qmi_service +service mlog_qmi_service /vendor/bin/mlog_qmi_service class late_start user root # Thermal Manager service -service thermanager /system/vendor/bin/thermanager /system/vendor/etc/thermanager.xml +service thermanager /vendor/bin/thermanager /vendor/etc/thermanager.xml class main user root group root -service irsc_util /system/vendor/bin/irsc_util "/system/vendor/etc/sec_config" +service irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config" class main user root oneshot -service rmt_storage /system/vendor/bin/rmt_storage +service rmt_storage /vendor/bin/rmt_storage class core user root group system wakelock -service sensors /system/vendor/bin/sensors.qcom +service sensors /vendor/bin/sensors.qcom class core user root group root wakelock -service qcom-sensor-sh /system/vendor/bin/init.qcom-sensor.sh +service qcom-sensor-sh /vendor/bin/init.qcom-sensor.sh class main user root oneshot # HexagonDSP FastRPC daemon -service adsprpcd /system/vendor/bin/adsprpcd +service adsprpcd /vendor/bin/adsprpcd class main user media group media @@ -547,7 +547,7 @@ service mediadrm /system/bin/mediadrmserver group mediadrm drmrpc ioprio rt 4 -service mpdecision /system/vendor/bin/mpdecision --avg_comp +service mpdecision /vendor/bin/mpdecision --avg_comp class main user root group root readproc @@ -561,7 +561,7 @@ service mpdecision /system/vendor/bin/mpdecision --avg_comp seclabel u:r:uim:s0 # OSS time -service timekeep /system/vendor/bin/timekeep restore +service timekeep /vendor/bin/timekeep restore class late_start user root group root @@ -569,7 +569,7 @@ service timekeep /system/vendor/bin/timekeep restore writepid /dev/cpuset/system-background/tasks # Quick Charge -service hvdcp /system/vendor/bin/hvdcp +service hvdcp /vendor/bin/hvdcp class core user root disabled diff --git a/rootdir/etc/init.sony.rc b/rootdir/etc/init.sony.rc index 0902fd2..6d548f5 100644 --- a/rootdir/etc/init.sony.rc +++ b/rootdir/etc/init.sony.rc @@ -17,7 +17,7 @@ on post-fs-data mkdir /idd/socket 0711 system system restorecon_recursive /idd -service iddd /system/vendor/bin/iddd +service iddd /vendor/bin/iddd class main user system group system log inet cameraserver media diff --git a/shinano.mk b/shinano.mk index 9ca9540..3e8f7a9 100644 --- a/shinano.mk +++ b/shinano.mk @@ -98,7 +98,7 @@ PRODUCT_PACKAGES += \ # IPC Security Config PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/sec_config:system/vendor/etc/sec_config + $(COMMON_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config # Keystore PRODUCT_PACKAGES += \ diff --git a/system_prop.mk b/system_prop.mk index 9fe7ee1..69a505b 100644 --- a/system_prop.mk +++ b/system_prop.mk @@ -39,7 +39,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Assertive Display PRODUCT_PROPERTY_OVERRIDES += \ ro.qcom.ad=1 \ - ro.qcom.ad.calib.data=/system/vendor/etc/ad_calib.cfg + ro.qcom.ad.calib.data=/vendor/etc/ad_calib.cfg # Audio HAL PRODUCT_PROPERTY_OVERRIDES += \ -- cgit v1.2.3