diff options
| author | Thierry Strudel <tstrudel@google.com> | 2017-03-11 14:37:15 -0800 |
|---|---|---|
| committer | Thierry Strudel <tstrudel@google.com> | 2017-03-11 14:37:20 -0800 |
| commit | 48e31bec582e3854b3aaad0ebaaf4ac2ad6a33db (patch) | |
| tree | 72c83345b67c065170359052a8ea99351990d26f | |
| parent | 5752ddcecf884adefc166873565da60e70f59400 (diff) | |
| download | bt-48e31bec582e3854b3aaad0ebaaf4ac2ad6a33db.tar.gz | |
msm8998: break dependency to libbtnv not part of AOSP
Bug: 32451377
Change-Id: I39c728afcaf39a2de2bbe41024c8fd289cba6105
Signed-off-by: Thierry Strudel <tstrudel@google.com>
| -rw-r--r-- | msm8998/libbt-vendor/Android.mk | 8 | ||||
| -rw-r--r-- | msm8998/libbt-vendor/src/bt_vendor_qcom.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/msm8998/libbt-vendor/Android.mk b/msm8998/libbt-vendor/Android.mk index 208cc9b..9cc65cf 100644 --- a/msm8998/libbt-vendor/Android.mk +++ b/msm8998/libbt-vendor/Android.mk @@ -27,8 +27,7 @@ LOCAL_SRC_FILES := \ src/hci_uart.c \ src/hci_smd.c \ src/hw_rome.c \ - src/hw_ar3k.c \ - src/bt_vendor_persist.cpp + src/hw_ar3k.c ifneq ($(TARGET_USES_AOSP),true) #Disable this flag in case if FM over UART support not needed @@ -65,8 +64,7 @@ endif #WIFI_BT_STATUS_SYNC LOCAL_SHARED_LIBRARIES := \ libcutils \ - liblog \ - libbtnv + liblog LOCAL_MODULE := libbt-vendor LOCAL_MODULE_TAGS := optional @@ -80,7 +78,7 @@ else LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) endif -LOCAL_CFLAGS += -DBT_NV_SUPPORT +#LOCAL_CFLAGS += -DBT_NV_SUPPORT ifneq ($(BOARD_ANT_WIRELESS_DEVICE),) LOCAL_CFLAGS += -DENABLE_ANT diff --git a/msm8998/libbt-vendor/src/bt_vendor_qcom.c b/msm8998/libbt-vendor/src/bt_vendor_qcom.c index 86a6fc9..de403e6 100644 --- a/msm8998/libbt-vendor/src/bt_vendor_qcom.c +++ b/msm8998/libbt-vendor/src/bt_vendor_qcom.c @@ -957,12 +957,14 @@ userial_open: ignore_boot_prop = TRUE; } #endif //READ_BT_ADDR_FROM_PROP +#ifdef BT_NV_SUPPORT /* Always read BD address from NV file */ if(ignore_boot_prop && !bt_vendor_nv_read(1, q->bdaddr)) { /* Since the BD address is configured in boot time We should not be here */ ALOGI("Failed to read BD address. Use the one from bluedroid stack/ftm"); } +#endif //BT_NV_SUPPORT if(rome_soc_init(fd, (char*)q->bdaddr)<0) { retval = -1; } else { |