Merge changes from topic "legacy" into q
* changes:
libbt: Fix Compilation Errors
8992: libbt: bt_vendor_qcom remove ssr_cleanup
8992: libbt: Add -Wno-pointer-sign flag to fix compilation error
Revert "msm8974: remove from top level makefile"
diff --git a/Android.mk b/Android.mk
index 85e8d12..ebd1403 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
ifneq ($(BOARD_IS_AUTOMOTIVE),true)
- ifneq ($(filter msm8x27 msm8226,$(TARGET_BOARD_PLATFORM)),)
+ ifneq ($(filter msm8x27 msm8974 msm8226,$(TARGET_BOARD_PLATFORM)),)
include $(call all-named-subdir-makefiles,msm8960)
else ifneq ($(filter msm8994,$(TARGET_BOARD_PLATFORM)),)
include $(call all-named-subdir-makefiles,msm8992)
diff --git a/msm8992/libbt-vendor/Android.mk b/msm8992/libbt-vendor/Android.mk
index e5ae9f1..84cd843 100644
--- a/msm8992/libbt-vendor/Android.mk
+++ b/msm8992/libbt-vendor/Android.mk
@@ -64,7 +64,7 @@
# libbtnv
#LOCAL_CFLAGS += -DBT_NV_SUPPORT
-LOCAL_CFLAGS += -Wno-error
+LOCAL_CFLAGS += -Wno-error -Wno-pointer-sign
LOCAL_MODULE := libbt-vendor
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
diff --git a/msm8992/libbt-vendor/src/bt_vendor_qcom.c b/msm8992/libbt-vendor/src/bt_vendor_qcom.c
index aa356a8..40f73de 100644
--- a/msm8992/libbt-vendor/src/bt_vendor_qcom.c
+++ b/msm8992/libbt-vendor/src/bt_vendor_qcom.c
@@ -1088,6 +1088,6 @@
sizeof(bt_vendor_interface_t),
init,
op,
- cleanup,
- ssr_cleanup
+ cleanup
+
};
diff --git a/msm8992/libbt-vendor/src/hw_ar3k.c b/msm8992/libbt-vendor/src/hw_ar3k.c
index dbe6b51..2c9af3c 100644
--- a/msm8992/libbt-vendor/src/hw_ar3k.c
+++ b/msm8992/libbt-vendor/src/hw_ar3k.c
@@ -49,6 +49,9 @@
#include <stdlib.h>
#include <string.h>
#include <termios.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/uio.h>
#include "bt_hci_bdroid.h"
#include "hci_uart.h"