From 21e26200fdca9031f5b9885158fdf9ad5b0f342e Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Sun, 4 Feb 2018 10:40:32 +0100 Subject: msm8996-common: Deprecate system/vendor completely Signed-off-by: Davide Garberi --- Android.mk | 2 +- config.fs | 6 ------ rootdir/etc/init.qcom.rc | 14 +++++++------- sepolicy/file_contexts | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Android.mk b/Android.mk index 7979f2b..2f0a570 100644 --- a/Android.mk +++ b/Android.mk @@ -37,7 +37,7 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "IMS lib link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /system/vendor/lib64/$(notdir $@) $@ + $(hide) ln -sf /vendor/lib64/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) diff --git a/config.fs b/config.fs index 8ce1618..cdb02c0 100644 --- a/config.fs +++ b/config.fs @@ -49,12 +49,6 @@ user: AID_GPS group: AID_GPS caps: NET_BIND_SERVICE -[system/vendor/bin/slim_daemon] -mode: 0755 -user: AID_GPS -group: AID_GPS -caps: NET_BIND_SERVICE - [vendor/bin/xtwifi-client] mode: 0755 user: AID_GPS diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index dd7e76e..7e99689 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -558,7 +558,7 @@ service imsdatadaemon /vendor/bin/imsdatadaemon writepid /dev/cpuset/system-background/tasks disabled -service pd_mapper /system/vendor/bin/pd-mapper +service pd_mapper /vendor/bin/pd-mapper class core disabled @@ -625,7 +625,7 @@ service tlocd /system/bin/tloc_daemon group drmrpc gps net_raw seclabel u:r:tlocd:s0 -service readmac /system/vendor/bin/readmac +service readmac /vendor/bin/readmac class main user root group root @@ -637,7 +637,7 @@ service energy-awareness /vendor/bin/energy-awareness group system oneshot -service mdtpd /system/vendor/bin/mdtpd +service mdtpd /vendor/bin/mdtpd class late_start user root group system radio drmrpc @@ -789,19 +789,19 @@ service netmgrd /vendor/bin/netmgrd group root wifi wakelock radio inet writepid /dev/cpuset/system-background/tasks -service ipacm /system/vendor/bin/ipacm +service ipacm /vendor/bin/ipacm class main user radio group radio inet writepid /dev/cpuset/system-background/tasks -service qti /system/vendor/bin/qti +service qti /vendor/bin/qti class main user radio group radio oem_2901 usb writepid /dev/cpuset/system-background/tasks -service sensors /system/vendor/bin/sensors.qcom +service sensors /vendor/bin/sensors.qcom class core user root group root wakelock @@ -897,7 +897,7 @@ service wfdservice /system/bin/wfdservice #graphics net_bt net_bt_admin bluetooth # Seemp health service -service seemp_healthd /system/vendor/bin/seemp_healthd +service seemp_healthd /vendor/bin/seemp_healthd class late_start user system group system diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 90d9a88..43df33d 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -39,4 +39,4 @@ /(vendor|system/vendor)/bin/readmac u:object_r:readmac_exec:s0 # ril -/system/vendor/radio/qcril_database/qcril.db u:object_r:nv_data_file:s0 +/(vendor|system/vendor)/radio/qcril_database/qcril.db u:object_r:nv_data_file:s0 -- cgit v1.2.3