commit 7933ab1a1171205f3ac4cb7e40e5e49027c408e4
author Sudhir Sharma <sudhshar@codeaurora.org> Tue Jul 29 16:55:31 2014 -0700
committer Sudhir Sharma <sudhshar@codeaurora.org> Tue Jul 29 16:59:12 2014 -0700
tree 85f6042ee688d1d0d29850d00b272e2d66bc5546
parent 7980fac73aa55f23361c28e26efc1428b46b05ff
parent fed02ddc5423dbce1990018868d3846eee75435d

Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.073' into HEAD

AU_LINUX_ANDROID_KK.04.04.04.010.073 based on quic/aosp/kk

Change-Id: Iac24dfc09bb493b0d246d8965ea8dc330c22f824

libbt-vendor/Android.mk

diff --git a/libbt-vendor/Android.mk b/libbt-vendor/Android.mk
index 3db69b7..540592b 100644
--- a/libbt-vendor/Android.mk
+++ b/libbt-vendor/Android.mk
@@ -62,7 +62,6 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
 
 LOCAL_CFLAGS += -DBT_NV_SUPPORT
 

libbt-vendor/include/bt_vendor_qcom.h

diff --git a/libbt-vendor/include/bt_vendor_qcom.h b/libbt-vendor/include/bt_vendor_qcom.h
index 07d184d..739a517 100644
--- a/libbt-vendor/include/bt_vendor_qcom.h
+++ b/libbt-vendor/include/bt_vendor_qcom.h
@@ -18,7 +18,7 @@
 #define BT_VENDOR_QCOM_H
 
 #include "bt_vendor_lib.h"
-#include "vnd_buildcfg.h"
+//#include "vnd_buildcfg.h"
 #include "utils.h"
 
 #ifndef FALSE