Bluetooth: Modify the make file with correct paths.
In M-release bluedroid stack is moved to system/bt/ directory.
Changed the make file accordingly in order to build the project
and avoid compilation errors.
Change-Id: I3d7ce7c7e6a89d107de1c47515d7d6dbd1121f6f
diff --git a/libbt-vendor/Android.mk b/libbt-vendor/Android.mk
index 3414909..21b6102 100644
--- a/libbt-vendor/Android.mk
+++ b/libbt-vendor/Android.mk
@@ -20,7 +20,6 @@
include $(CLEAR_VARS)
-BDROID_DIR:= external/bluetooth/bluedroid
LOCAL_SRC_FILES := \
src/bt_vendor_qcom.c \
@@ -41,7 +40,8 @@
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
- $(BDROID_DIR)/hci/include \
+ external/bluetooth/bluedroid/hci/include \
+ system/bt/hci/include \
$(TARGET_OUT_HEADERS)/bt/hci_qcomm_init
ifeq ($(BOARD_HAS_QCA_BT_AR3002), true)
@@ -63,10 +63,17 @@
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_OWNER := qcom
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
+else
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+endif
+
LOCAL_CFLAGS += -DBT_NV_SUPPORT
#LOCAL_CFLAGS += -DREAD_BT_ADDR_FROM_PROP
-include $(LOCAL_PATH)/vnd_buildcfg.mk
+#include $(LOCAL_PATH)/vnd_buildcfg.mk
include $(BUILD_SHARED_LIBRARY)