commit 75122c17c8c4827bf26387f2c734e65846fb5d49
author John Stultz <john.stultz@linaro.org> Wed Aug 02 22:12:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 22:12:42 2017 +0000
tree 70132e252b68c679c5ca1c215de9eb9f7841d157
parent a3fc4fd2baa2f475ac488b23caecd439d19baa59
parent dee7b99b88961bc2636f7cbae836dbe8dbb1b546

Merge "hikey960.mk: Enable the common linux bluetooth HAL for 4.9+ kernels" am: f96b276b4c am: 143a476a4c am: 5717cc9264
am: dee7b99b88

Change-Id: Iee1d9e3b1247bcca062099b6cdcb233ac4f324c3

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index cb3e9f5..0245c36 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -4,7 +4,11 @@
 TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image.gz-hikey960-$(TARGET_KERNEL_USE)
 TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi3660-hikey960.dtb-$(TARGET_KERNEL_USE)
 
-HIKEY_USE_LEGACY_TI_BLUETOOTH := true
+ifeq ($(TARGET_KERNEL_USE), 4.4)
+  HIKEY_USE_LEGACY_TI_BLUETOOTH := true
+else
+  HIKEY_USE_LEGACY_TI_BLUETOOTH := false
+endif
 
 #
 # Inherit the full_base and device configurations