diff options
| author | Alexey Polyudov <apolyudov@google.com> | 2017-09-26 13:33:55 -0700 |
|---|---|---|
| committer | Alexey Polyudov <apolyudov@google.com> | 2017-09-26 13:33:55 -0700 |
| commit | 478149de232bee35e863d9212fe7523777e11878 (patch) | |
| tree | 4ec7ce9b92de35e0d59375fa2a67719aa1fa841a | |
| parent | df2ae425fa5522ed09de9f414f8cca775d6e0986 (diff) | |
| download | bt-478149de232bee35e863d9212fe7523777e11878.tar.gz | |
Disable QCOM-specific build flag
Change-Id: Ic0a71365a4c01f9f46fb137bb8a7a8978850d744
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
| -rw-r--r-- | libbt-vendor/Android.mk | 4 | ||||
| -rwxr-xr-x | libbt-vendor/src/bt_vendor_qcom.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libbt-vendor/Android.mk b/libbt-vendor/Android.mk index 8d3f9d4..a6930e2 100644 --- a/libbt-vendor/Android.mk +++ b/libbt-vendor/Android.mk @@ -31,7 +31,8 @@ LOCAL_SRC_FILES := \ src/bt_vendor_persist.cpp #Disable this flag in case if FM over UART support not needed -LOCAL_CFLAGS := -DFM_OVER_UART +# AP: disable this flas as it is using QCOM BT extension that is not defined in system/bt/hci/include +#LOCAL_CFLAGS := -DFM_OVER_UART ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DPANIC_ON_SOC_CRASH @@ -40,7 +41,6 @@ endif LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/include \ - external/bluetooth/bluedroid/hci/include \ system/bt/hci/include \ $(TARGET_OUT_HEADERS)/bt/hci_qcomm_init \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c index 7e0e447..59b7f82 100755 --- a/libbt-vendor/src/bt_vendor_qcom.c +++ b/libbt-vendor/src/bt_vendor_qcom.c @@ -30,6 +30,9 @@ #include <cutils/properties.h> #include <fcntl.h> #include <termios.h> + +#include <bt_vendor_lib.h> + #include "bt_vendor_qcom.h" #include "hci_uart.h" #include "hci_smd.h" @@ -39,7 +42,6 @@ #include <linux/un.h> #include "bt_vendor_persist.h" #include "hw_rome.h" -#include "bt_vendor_lib.h" #define WAIT_TIMEOUT 200000 #define BT_VND_OP_GET_LINESPEED 30 |