marlin: Update fixed paths for wcnss_filter
The binary was moved from /system/ to /vendor/
Update the hard-coded paths to match.
While I was there:
Move qseecomd entry to /vendor/ section in sepolicy/file_contexts.
Bug: 35373416
Test: Bluetooth starts on boot
ls -laZ /vendor/bin/wcnss_filter shows u:object_r:wcnss_filter_exec:s0
Change-Id: Ieecb937e3e26f3d314a1e462bec30bc799b43599
diff --git a/init.common.rc b/init.common.rc
index 74e2a5f..237780b 100755
--- a/init.common.rc
+++ b/init.common.rc
@@ -417,7 +417,7 @@
on property:wc_transport.start_hci=false
stop start_hci_filter
-service start_hci_filter /system/bin/wcnss_filter
+service start_hci_filter /vendor/bin/wcnss_filter
class late_start
user bluetooth
group bluetooth diag
@@ -429,7 +429,7 @@
on property:wc_transport.start_root=false
stop hci_filter_root
-service hci_filter_root /system/bin/wcnss_filter
+service hci_filter_root /vendor/bin/wcnss_filter
class late_start
user bluetooth
group bluetooth diag system
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 6fcfc9f..4dbdc82 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -50,7 +50,7 @@
system/bin/test_diag \
system/bin/test_module_pproc \
system/bin/time_daemon \
- system/bin/wcnss_filter \
+ vendor/bin/wcnss_filter \
system/bin/wdsdaemon \
system/bin/WifiLogger_app \
system/etc/acdbdata/Bluetooth_cal.acdb \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index b88895a..2aa6f89 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -59,7 +59,7 @@
vendor/qcom/marlin/proprietary/test_diag:system/bin/test_diag:qcom \
vendor/qcom/marlin/proprietary/test_module_pproc:system/bin/test_module_pproc:qcom \
vendor/qcom/marlin/proprietary/time_daemon:system/bin/time_daemon:qcom \
- vendor/qcom/marlin/proprietary/wcnss_filter:system/bin/wcnss_filter:qcom \
+ vendor/qcom/marlin/proprietary/wcnss_filter:vendor/bin/wcnss_filter:qcom \
vendor/qcom/marlin/proprietary/wdsdaemon:system/bin/wdsdaemon:qcom \
vendor/qcom/marlin/proprietary/WifiLogger_app:system/bin/WifiLogger_app:qcom \
vendor/qcom/marlin/proprietary/Bluetooth_cal.acdb:system/etc/acdbdata/Bluetooth_cal.acdb:qcom \
diff --git a/self-extractors_sailfish/extract-lists.txt b/self-extractors_sailfish/extract-lists.txt
index 2eb35ab..aadf9ad 100644
--- a/self-extractors_sailfish/extract-lists.txt
+++ b/self-extractors_sailfish/extract-lists.txt
@@ -51,7 +51,7 @@
system/bin/test_diag \
system/bin/test_module_pproc \
system/bin/time_daemon \
- system/bin/wcnss_filter \
+ vendor/bin/wcnss_filter \
system/bin/wdsdaemon \
system/bin/WifiLogger_app \
system/etc/acdbdata/Bluetooth_cal.acdb \
diff --git a/self-extractors_sailfish/qcom/staging/device-partial.mk b/self-extractors_sailfish/qcom/staging/device-partial.mk
index 7dcdac6..7307a90 100644
--- a/self-extractors_sailfish/qcom/staging/device-partial.mk
+++ b/self-extractors_sailfish/qcom/staging/device-partial.mk
@@ -60,7 +60,7 @@
vendor/qcom/sailfish/proprietary/test_diag:system/bin/test_diag:qcom \
vendor/qcom/sailfish/proprietary/test_module_pproc:system/bin/test_module_pproc:qcom \
vendor/qcom/sailfish/proprietary/time_daemon:system/bin/time_daemon:qcom \
- vendor/qcom/sailfish/proprietary/wcnss_filter:system/bin/wcnss_filter:qcom \
+ vendor/qcom/sailfish/proprietary/wcnss_filter:vendor/bin/wcnss_filter:qcom \
vendor/qcom/sailfish/proprietary/wdsdaemon:system/bin/wdsdaemon:qcom \
vendor/qcom/sailfish/proprietary/WifiLogger_app:system/bin/WifiLogger_app:qcom \
vendor/qcom/sailfish/proprietary/Bluetooth_cal.acdb:system/etc/acdbdata/Bluetooth_cal.acdb:qcom \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index f5ab8ab..3c3be81 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -84,7 +84,6 @@
/system/bin/pm-proxy u:object_r:per_proxy_exec:s0
/system/bin/rmt_storage u:object_r:rmt_exec:s0
/system/bin/time_daemon u:object_r:time_exec:s0
-/system/bin/wcnss_filter u:object_r:wcnss_filter_exec:s0
/system/bin/nanoapp_cmd u:object_r:nanoapp_cmd_exec:s0
/system/bin/netmgrd u:object_r:netmgrd_exec:s0
/system/bin/qmuxd u:object_r:qmuxd_exec:s0
@@ -94,7 +93,6 @@
/system/bin/loc_launcher u:object_r:location_exec:s0
/system/bin/location-mq u:object_r:location_exec:s0
/system/bin/lowi-server u:object_r:location_exec:s0
-/vendor/bin/qseecomd u:object_r:tee_exec:s0
/system/bin/cnd u:object_r:cnd_exec:s0
/system/bin/imsdatadaemon u:object_r:ims_exec:s0
/system/bin/imsqmidaemon u:object_r:ims_exec:s0
@@ -123,6 +121,8 @@
/vendor/bin/nanohub_slpi u:object_r:nanohub_slpi_exec:s0
/vendor/bin/perfd u:object_r:perfd_exec:s0
/vendor/bin/thermal-engine u:object_r:thermal-engine_exec:s0
+/vendor/bin/qseecomd u:object_r:tee_exec:s0
+/vendor/bin/wcnss_filter u:object_r:wcnss_filter_exec:s0
# /sys
/sys/devices/virtual/nanohub/nanohub(/.*)? u:object_r:sysfs_nanoapp_cmd:s0
diff --git a/sepolicy/wcnss_filter.te b/sepolicy/wcnss_filter.te
index 66aac58..0d6d3d1 100644
--- a/sepolicy/wcnss_filter.te
+++ b/sepolicy/wcnss_filter.te
@@ -1,4 +1,4 @@
-# Policy for /system/bin/wcnss_filter
+# Policy for /vendor/bin/wcnss_filter
type wcnss_filter, domain;
type wcnss_filter_exec, exec_type, file_type;
