commit 143a476a4cf46006f39c87f6344473ff64de6e72
author John Stultz <john.stultz@linaro.org> Wed Aug 02 21:58:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 21:58:04 2017 +0000
tree e2f079b3737141120ee9269bb5e1b1bb280fae97
parent 5b32041c9fcff433f3ee92a5edecc88d88eaf2be
parent f96b276b4ce1636573efa23b13b1948c2ab5a57c

Merge "hikey960.mk: Enable the common linux bluetooth HAL for 4.9+ kernels"
am: f96b276b4c

Change-Id: I75532287ef3e0edafff634a45e17e0df774fd992

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