Make libbt-vendor build with the VNDK.

When the vndk is enabled (BOARD_VNDK_VERSION=current),
vendor libraries must only link against vendor variants
in the build system. This also means that they receive
restricted sets of headers and that automatic global
headers are restricted.

Test: build libbt-vendor with BOARD_VNDK_VERSION=current
Bug: 69526027
Change-Id: I2ff78cccc417d0fff8cacb8b82fa8dc3d6f074ab

7 files changed, 13 insertions, 7 deletions

diff --git a/msm8996/libbt-vendor/src/bt_vendor_persist.cpp b/msm8996/libbt-vendor/src/bt_vendor_persist.cpp
index 519e826..8505797 100644
--- a/msm8996/libbt-vendor/src/bt_vendor_persist.cpp
+++ b/msm8996/libbt-vendor/src/bt_vendor_persist.cpp
@@ -28,7 +28,7 @@
 
 #ifdef BT_NV_SUPPORT
 #include "bt_nv.h"
-#include <utils/Log.h>
+#include <log/log.h>
 
 /*===========================================================================
 FUNCTION   bt_vendor_nv_read
diff --git a/msm8996/libbt-vendor/src/bt_vendor_qcom.c b/msm8996/libbt-vendor/src/bt_vendor_qcom.c
index 3ad87b8..7520967 100644
--- a/msm8996/libbt-vendor/src/bt_vendor_qcom.c
+++ b/msm8996/libbt-vendor/src/bt_vendor_qcom.c
@@ -33,7 +33,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <utils/Log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include "bt_vendor_qcom.h"
 #include "hci_uart.h"
diff --git a/msm8996/libbt-vendor/src/hardware.c b/msm8996/libbt-vendor/src/hardware.c
index a1ebd35..b7b13aa 100644
--- a/msm8996/libbt-vendor/src/hardware.c
+++ b/msm8996/libbt-vendor/src/hardware.c
@@ -26,7 +26,6 @@
 
 #define LOG_TAG "bt_vendor"
 
-#include <utils/Log.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -36,8 +35,10 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <cutils/properties.h>
+#include <log/log.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "bt_hci_bdroid.h"
 #include "bt_vendor_qcom.h"
 #include <string.h>
diff --git a/msm8996/libbt-vendor/src/hci_smd.c b/msm8996/libbt-vendor/src/hci_smd.c
index 3ddbcc2..44e95db 100644
--- a/msm8996/libbt-vendor/src/hci_smd.c
+++ b/msm8996/libbt-vendor/src/hci_smd.c
@@ -24,17 +24,18 @@
 
 #define LOG_TAG "bt_vendor"
 
-#include <utils/Log.h>
 #include <termios.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <cutils/properties.h>
 #include "bt_vendor_qcom.h"
 #include "hci_smd.h"
 #include <string.h>
 #include <cutils/properties.h>
+#include <log/log.h>
 
 /*****************************************************************************
 **   Macros & Constants
diff --git a/msm8996/libbt-vendor/src/hci_uart.c b/msm8996/libbt-vendor/src/hci_uart.c
index e4ce994..b15c583 100644
--- a/msm8996/libbt-vendor/src/hci_uart.c
+++ b/msm8996/libbt-vendor/src/hci_uart.c
@@ -26,12 +26,13 @@
 
 #define LOG_TAG "bt_vendor"
 
-#include <utils/Log.h>
 #include <termios.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <log/log.h>
 #include "bt_vendor_qcom.h"
 #include "hci_uart.h"
 #include <string.h>
diff --git a/msm8996/libbt-vendor/src/hw_ar3k.c b/msm8996/libbt-vendor/src/hw_ar3k.c
index f8e3342..e3b72dc 100644
--- a/msm8996/libbt-vendor/src/hw_ar3k.c
+++ b/msm8996/libbt-vendor/src/hw_ar3k.c
@@ -34,8 +34,9 @@ extern "C" {
 
 #define LOG_TAG "bt_vendor"
 
+#include <sys/uio.h>
 #include <sys/socket.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -49,6 +50,7 @@ extern "C" {
 #include <string.h>
 #include <termios.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "bt_hci_bdroid.h"
 #include "hci_uart.h"
diff --git a/msm8996/libbt-vendor/src/hw_rome.c b/msm8996/libbt-vendor/src/hw_rome.c
index cede337..b2b3126 100644
--- a/msm8996/libbt-vendor/src/hw_rome.c
+++ b/msm8996/libbt-vendor/src/hw_rome.c
@@ -35,7 +35,7 @@ extern "C" {
 #define LOG_TAG "bt_vendor"
 
 #include <sys/socket.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -50,6 +50,7 @@ extern "C" {
 #include <termios.h>
 #include <string.h>
 #include <stdbool.h>
+#include <unistd.h>
 
 #include "bt_hci_bdroid.h"
 #include "bt_vendor_qcom.h"