From 34e8b2302597520b619ecc59162cfdf781f16665 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Wed, 15 Feb 2017 14:26:09 -0800 Subject: hikey: Move uim (Bluetooth daemon) to /vendor Test: VtsHalBluetoothV1_0TargetTest passes Change-Id: I31612e9511d3e80e02fd19e2a258fe187d90337c --- init.common.rc | 2 +- sepolicy/file_contexts | 2 +- wpan/uim/Android.mk | 1 + 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) -- cgit v1.2.3