diff options
| -rw-r--r-- | libbt-vendor/Android.mk | 6 | ||||
| -rwxr-xr-x | libbt-vendor/src/bt_vendor_qcom.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libbt-vendor/Android.mk b/libbt-vendor/Android.mk index 363a592..233fe50 100644 --- a/libbt-vendor/Android.mk +++ b/libbt-vendor/Android.mk @@ -62,8 +62,7 @@ endif #WIFI_BT_STATUS_SYNC LOCAL_SHARED_LIBRARIES := \ libcutils \ - liblog \ - libbtnv + liblog LOCAL_MODULE := libbt-vendor LOCAL_MODULE_TAGS := optional @@ -77,7 +76,10 @@ else LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) endif +ifneq ($(QCPATH),) LOCAL_CFLAGS += -DBT_NV_SUPPORT +LOCAL_SHARED_LIBRARIES += libbtnv +endif ifneq ($(BOARD_ANT_WIRELESS_DEVICE),) LOCAL_CFLAGS += -DENABLE_ANT diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c index 3468df4..507b067 100755 --- a/libbt-vendor/src/bt_vendor_qcom.c +++ b/libbt-vendor/src/bt_vendor_qcom.c @@ -977,12 +977,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 if(rome_soc_init(fd, (char*)q->bdaddr)<0) { retval = -1; } else { |