summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@google.com>2017-02-24 14:28:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-24 14:28:57 +0000
commit88f6b5f5f470c082d72e6abc419417b4f00424e5 (patch)
treedffcd3d13bd175346d3eaead470de91b12cc77fa
parent5a0b32f8ebf01cacd257d0c7f12f678df2df56e7 (diff)
parent57835c7a2fb9c58a10f4739e16819086dd8b7d47 (diff)
downloadhikey-88f6b5f5f470c082d72e6abc419417b4f00424e5.tar.gz
hikey: Move uim (Bluetooth daemon) to /vendor am: 34e8b23025 am: 794593f56b
am: 57835c7a2f Change-Id: I2f27bf4812de89e5ea3035916cae4d93edfe8ea2
-rw-r--r--init.common.rc2
-rw-r--r--sepolicy/file_contexts2
-rw-r--r--wpan/uim/Android.mk1
3 files changed, 3 insertions, 2 deletions
diff --git a/init.common.rc b/init.common.rc
index a13fa3ca..318ffc9b 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -88,7 +88,7 @@ on property:usb_speed.switch=full
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
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 5379f904..7b692d1c 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
diff --git a/wpan/uim/Android.mk b/wpan/uim/Android.mk
index 2beec72a..81501749 100644
--- a/wpan/uim/Android.mk
+++ b/wpan/uim/Android.mk
@@ -10,6 +10,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := uim
+LOCAL_PROPRIETARY_MODULE := true
include $(BUILD_EXECUTABLE)