Remove dependency from libbtnvandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-dev

BD_ADDR is passed by the stack and is not required to be
fetched from libbtnv

Change-Id: If77f1f96c11d6c78544428fec487da6dbb076b52

3 files changed, 20 insertions, 7 deletions

diff --git a/msm8992/libbt-vendor/Android.mk b/msm8992/libbt-vendor/Android.mk
index 2a512f0..ee4c0b8 100644
--- a/msm8992/libbt-vendor/Android.mk
+++ b/msm8992/libbt-vendor/Android.mk
@@ -28,8 +28,10 @@ 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
+
+# if read from bt nv
+#        src/bt_vendor_persist.cpp
 
 ifeq ($(QCOM_BT_USE_SIBS),true)
 LOCAL_CFLAGS += -DQCOM_BT_SIBS_ENABLE
@@ -55,15 +57,18 @@ endif #WIFI_BT_STATUS_SYNC
 
 LOCAL_SHARED_LIBRARIES := \
         libcutils \
-        liblog \
-        libbtnv
+        liblog
+
+
+# if read from bt nv
+#        libbtnv
+#LOCAL_CFLAGS += -DBT_NV_SUPPORT
 
 LOCAL_MODULE := libbt-vendor
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
 
-LOCAL_CFLAGS += -DBT_NV_SUPPORT
 #LOCAL_CFLAGS += -DREAD_BT_ADDR_FROM_PROP
 
 #include $(LOCAL_PATH)/vnd_buildcfg.mk
diff --git a/msm8992/libbt-vendor/include/bt_vendor_persist.h b/msm8992/libbt-vendor/include/bt_vendor_persist.h
index 4f2e8ee..78a245b 100644
--- a/msm8992/libbt-vendor/include/bt_vendor_persist.h
+++ b/msm8992/libbt-vendor/include/bt_vendor_persist.h
@@ -27,6 +27,8 @@
 #ifndef BT_VENDOR_PERSIST_H_
 #define BT_VENDOR_PERSIST_H_
 
+#ifdef BT_NV_SUPPORT
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -34,9 +36,9 @@ extern "C"
 
 #include <stdio.h>
 
-#ifdef BT_NV_SUPPORT
+//#ifdef BT_NV_SUPPORT
 
-#endif /* BT_NV_SUPPORT */
+//#endif /* BT_NV_SUPPORT */
 typedef unsigned char boolean;
 /*===========================================================================
 FUNCTION   bt_vendor_nv_read
@@ -65,5 +67,7 @@ extern uint8_t bt_vendor_nv_read
 }
 #endif
 
+#endif /* BT_NV_SUPPORT */
+
 #endif /* BT_VENDOR_PERSIST_H_ */
 
diff --git a/msm8992/libbt-vendor/src/bt_vendor_qcom.c b/msm8992/libbt-vendor/src/bt_vendor_qcom.c
index b5d8bfa..4d16678 100644
--- a/msm8992/libbt-vendor/src/bt_vendor_qcom.c
+++ b/msm8992/libbt-vendor/src/bt_vendor_qcom.c
@@ -37,7 +37,9 @@
 #include <sys/socket.h>
 #include <cutils/sockets.h>
 #include <linux/un.h>
+#ifdef BT_NV_SUPPORT
 #include "bt_vendor_persist.h"
+#endif
 #include "hw_rome.h"
 
 #define WAIT_TIMEOUT 200000
@@ -798,12 +800,14 @@ static int op(bt_vendor_opcode_t opcode, void *param)
                                         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, vnd_local_bd_addr))
                                     {
                                        /* 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,vnd_local_bd_addr)<0) {
                                         retval = -1;
                                         userial_clock_operation(fd, USERIAL_OP_CLK_OFF);