Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/hardware/qcom/bt into n7.1
Android 7.1.0 release 4
diff --git a/Android.mk b/Android.mk
index 3f778ac..99e52a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,10 @@
+BT_VENDOR_PATH := $(call my-dir)
+
+ifeq ($(BT_VENDOR_PATH),$(call project-path-for,bt-vendor))
+
# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
ifneq ($(TARGET_BOARD_AUTO),true)
- ifneq ($(filter msm8960 msm8x27 msm8226,$(TARGET_BOARD_PLATFORM)),)
+ ifneq ($(filter msm8960 msm8x27 msm8974 msm8226,$(TARGET_BOARD_PLATFORM)),)
include $(call all-named-subdir-makefiles,msm8960)
else
ifneq ($(filter msm8994 msm8992,$(TARGET_BOARD_PLATFORM)),)
@@ -17,3 +21,5 @@
endif
endif
endif
+
+endif
diff --git a/msm8992/libbt-vendor/Android.mk b/msm8992/libbt-vendor/Android.mk
index ee4c0b8..70f5bb9 100644
--- a/msm8992/libbt-vendor/Android.mk
+++ b/msm8992/libbt-vendor/Android.mk
@@ -69,6 +69,9 @@
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_OWNER := qcom
+ifneq ($(BOARD_ANT_WIRELESS_DEVICE),)
+LOCAL_CFLAGS += -DENABLE_ANT
+endif
#LOCAL_CFLAGS += -DREAD_BT_ADDR_FROM_PROP
#include $(LOCAL_PATH)/vnd_buildcfg.mk
diff --git a/msm8992/libbt-vendor/include/bt_vendor_qcom.h b/msm8992/libbt-vendor/include/bt_vendor_qcom.h
index cf7d9e9..156d6c0 100644
--- a/msm8992/libbt-vendor/include/bt_vendor_qcom.h
+++ b/msm8992/libbt-vendor/include/bt_vendor_qcom.h
@@ -41,6 +41,10 @@
BT_SOC_RESERVED
}bt_soc_type;
+typedef enum {
+ BT_VND_OP_ANT_USERIAL_OPEN = 254,
+ BT_VND_OP_ANT_USERIAL_CLOSE
+}ant_serial;
extern bt_vendor_callbacks_t *bt_vendor_cbacks;
/* HW_NEED_END_WITH_HCI_RESET