commit 794593f56bc6bd1a79d4741a4f7f45319a67afda
author Myles Watson <mylesgw@google.com> Fri Feb 24 14:23:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 24 14:23:26 2017 +0000
tree 9ee9bfc4a825a9b666e6a6d50a8dc76e78e4815b
parent 96569410e4325e540ab9b45d6c693440d69e84fa
parent 34e8b2302597520b619ecc59162cfdf781f16665

hikey: Move uim (Bluetooth daemon) to /vendor
am: 34e8b23025

Change-Id: I03f0804a368ad28073a139634d66e5c6c8a0956a

init.common.rc

diff --git a/init.common.rc b/init.common.rc
index a13fa3c..318ffc9 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -88,7 +88,7 @@
     write /sys/kernel/debug/f72c0000.usb/config "1"
 
 #userspace daemon needed for bluetooth
-service uim /system/bin/uim
+service uim /vendor/bin/uim
     class main
     user bluetooth
     group bluetooth net_bt_admin system

sepolicy/file_contexts

diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 5379f90..7b692d1 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -5,5 +5,5 @@
 /dev/dri/card0         u:object_r:gpu_device:s0
 /dev/hci_tty           u:object_r:hci_attach_dev:s0
 /dev/ttyAMA1           u:object_r:hci_attach_dev:s0
-/system/bin/uim        u:object_r:hci_attach_exec:s0
+/system/vendor/bin/uim u:object_r:hci_attach_exec:s0
 /system/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service\.hikey      u:object_r:hal_bluetooth_hikey_exec:s0

wpan/uim/Android.mk

diff --git a/wpan/uim/Android.mk b/wpan/uim/Android.mk
index 2beec72..8150174 100644
--- a/wpan/uim/Android.mk
+++ b/wpan/uim/Android.mk
@@ -10,6 +10,7 @@
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE := uim
+LOCAL_PROPRIETARY_MODULE := true
 
 include $(BUILD_EXECUTABLE)