summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@google.com>2017-02-15 11:45:10 -0800
committerMyles Watson <mylesgw@google.com>2017-02-15 20:19:44 +0000
commit21d19b6333f7cddba7cbcf2c201b72ce29239f8b (patch)
tree3956207353a558954eb071fd84a1aa6c9269270c
parentee767baf28d969395e0b0866bede0009fdc8b6c1 (diff)
downloadbullhead-21d19b6333f7cddba7cbcf2c201b72ce29239f8b.tar.gz
bullhead: Update fixed paths for wcnss_filter
The binary was moved from /system/ to /vendor/ Update the hard-coded paths to match. Bug: 35373416 Test: Bluetooth starts on boot ls -laZ /vendor/bin/wcnss_filter shows u:object_r:wcnss_filter_exec:s0 Change-Id: I1577f954aa80a4cd090f2339476fc56919d1e0c9
-rw-r--r--init.bullhead.rc2
-rw-r--r--proprietary-blobs.txt2
-rw-r--r--self-extractors/extract-lists.txt2
-rw-r--r--self-extractors/qcom/staging/device-partial.mk2
-rw-r--r--sepolicy/file_contexts2
-rw-r--r--vendor_owner_info.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/init.bullhead.rc b/init.bullhead.rc
index 7ae6eea..bf8757a 100644
--- a/init.bullhead.rc
+++ b/init.bullhead.rc
@@ -273,7 +273,7 @@ service rmt_storage /system/bin/rmt_storage
user root
group system wakelock
-service start_hci_filter /system/bin/wcnss_filter
+service start_hci_filter /vendor/bin/wcnss_filter
class late_start
user bluetooth
group bluetooth system
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 4ce7435..1a6575a 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -63,7 +63,7 @@
/system/bin/test_diag
/system/bin/thermal-engine
/system/bin/time_daemon
-/system/bin/wcnss_filter
+/vendor/bin/wcnss_filter
/system/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb
/system/etc/acdbdata/MTP/MTP_General_cal.acdb
/system/etc/acdbdata/MTP/MTP_Global_cal.acdb
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index cf59337..bc8f4c4 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -54,7 +54,7 @@
system/bin/test_diag \
system/bin/thermal-engine \
system/bin/time_daemon \
- system/bin/wcnss_filter \
+ vendor/bin/wcnss_filter \
system/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb \
system/etc/acdbdata/MTP/MTP_General_cal.acdb \
system/etc/acdbdata/MTP/MTP_Global_cal.acdb \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 1a59c13..e32620a 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -63,7 +63,7 @@ PRODUCT_COPY_FILES := \
vendor/qcom/bullhead/proprietary/test_diag:system/bin/test_diag:qcom \
vendor/qcom/bullhead/proprietary/thermal-engine:system/bin/thermal-engine:qcom \
vendor/qcom/bullhead/proprietary/time_daemon:system/bin/time_daemon:qcom \
- vendor/qcom/bullhead/proprietary/wcnss_filter:system/bin/wcnss_filter:qcom \
+ vendor/qcom/bullhead/proprietary/wcnss_filter:vendor/bin/wcnss_filter:qcom \
vendor/qcom/bullhead/proprietary/MTP_Bluetooth_cal.acdb:system/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb:qcom \
vendor/qcom/bullhead/proprietary/MTP_General_cal.acdb:system/etc/acdbdata/MTP/MTP_General_cal.acdb:qcom \
vendor/qcom/bullhead/proprietary/MTP_Global_cal.acdb:system/etc/acdbdata/MTP/MTP_Global_cal.acdb:qcom \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 0f86022..063972f 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -103,7 +103,7 @@
/system/bin/irsc_util u:object_r:irsc_util_exec:s0
/system/bin/pm-service u:object_r:per_mgr_exec:s0
/system/bin/pm-proxy u:object_r:per_mgr_exec:s0
-/system/bin/wcnss_filter u:object_r:start_hci_filter_exec:s0
+/vendor/bin/wcnss_filter u:object_r:start_hci_filter_exec:s0
/vendor/bin/qseecomd u:object_r:tee_exec:s0
/system/bin/thermal-engine u:object_r:thermal-engine_exec:s0
/system/bin/msm_irqbalance u:object_r:msm_irqbalanced_exec:s0
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index 17fca8a..27f96eb 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -47,7 +47,7 @@ system/bin/subsystem_ramdump:qcom
system/bin/test_diag:qcom
system/bin/thermal-engine:qcom
system/bin/time_daemon:qcom
-system/bin/wcnss_filter:qcom
+vendor/bin/wcnss_filter:qcom
system/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb:qcom
system/etc/acdbdata/MTP/MTP_General_cal.acdb:qcom
system/etc/acdbdata/MTP/MTP_Global_cal.acdb:qcom