diff options
| author | Alexey Polyudov <apolyudov@google.com> | 2017-11-01 16:17:45 -0700 |
|---|---|---|
| committer | Alexey Polyudov <apolyudov@google.com> | 2017-11-01 16:17:45 -0700 |
| commit | 66e566bc17f55065aaacc06433ff06ca752939d7 (patch) | |
| tree | c8677c5abc5642e00969fc0bc4157f5a786e337b | |
| parent | a64033758e94b81200eaab04e3ebd696ba51aaaa (diff) | |
| parent | 228f24c988048603468b396a24ea5bbf0f264620 (diff) | |
| download | bt-66e566bc17f55065aaacc06433ff06ca752939d7.tar.gz | |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.6.3.R1.00355.2'
Conflicts:
libbt-vendor/Android.mk
Change-Id: Iaaa9bf7883dc2b16ca5e1fedd944ddac3d7f85cd
| -rw-r--r-- | libbt-vendor/Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libbt-vendor/Android.mk b/libbt-vendor/Android.mk index a6930e2..ad9671c 100644 --- a/libbt-vendor/Android.mk +++ b/libbt-vendor/Android.mk @@ -30,9 +30,11 @@ LOCAL_SRC_FILES := \ src/hw_ar3k.c \ src/bt_vendor_persist.cpp -#Disable this flag in case if FM over UART support not needed -# 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 +# By default, "ENABLE_FM_OVER_UART" is un-defined. +# To enable the feature, set it as "true" in "BoardConfig.mk". +ifeq ($(ENABLE_FM_OVER_UART), true) +LOCAL_CFLAGS := -DFM_OVER_UART +endif ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DPANIC_ON_SOC_CRASH @@ -41,6 +43,7 @@ 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 |