summaryrefslogtreecommitdiff
path: root/device-common.mk
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2017-05-30 23:51:33 -0700
committerJohn Stultz <john.stultz@linaro.org>2017-07-05 23:14:51 -0700
commitd497f63071b1f650d6558f69f41a259dcd3b6039 (patch)
tree9ffed9d0234be273026e49b7ccdb3dbfae6e5712 /device-common.mk
parent14fc8793687878c840f48f6c6c7a4d00aa628c16 (diff)
downloadhikey-d497f63071b1f650d6558f69f41a259dcd3b6039.tar.gz
hikey: Add HIKEY_USE_LEGACY_TI_BLUETOOTH build option to transition to common bluetooth HAL
This patch, a reworked version of changes from Satish Patel adds a build option to enable the common generic linux bluetooth HAL vs the legacy TI HAL. The legacy TI HAL is only needed on 4.4 and older kernels. NOTE: One needs to be using a kernel that supports the standard linux hci0 interface to successfully use this. Change-Id: I74927aa651b184fdb65957fcb54c4c0afffbfa7c Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'device-common.mk')
-rw-r--r--device-common.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/device-common.mk b/device-common.mk
index d4aa0da7..a8266369 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -21,7 +21,7 @@ $(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048
DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay
# Add openssh support for remote debugging and job submission
-PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh uim
+PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh
# Add wifi-related packages
PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond wifilogd
@@ -41,7 +41,6 @@ PRODUCT_PACKAGES += audio.a2dp.default \
PRODUCT_PACKAGES += \
android.hardware.audio@2.0-impl \
android.hardware.audio.effect@2.0-impl \
- android.hardware.bluetooth@1.0-service.hikey \
android.hardware.broadcastradio@1.0-impl \
android.hardware.soundtrigger@2.0-impl
@@ -55,6 +54,13 @@ PRODUCT_PACKAGES += TIInit_11.8.32.bts \
wl18xx-fw-4.bin \
wl18xx-conf.bin
+
+ifeq ($(HIKEY_USE_LEGACY_TI_BLUETOOTH), true)
+PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-service.hikey uim
+else
+PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-service.btlinux
+endif
+
# PowerHAL
PRODUCT_PACKAGES += android.hardware.power@1.0-impl