summaryrefslogtreecommitdiff
path: root/device-common.mk
diff options
context:
space:
mode:
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 0dc2ec2a..345f88d3 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
@@ -40,7 +40,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
@@ -62,6 +61,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