From 41401a5916f750f29af61bae35ca99f7e851333f Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 17 Jul 2017 10:17:59 -0700
Subject: [PATCH] Make system/bt 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 system/bt with BOARD_VNDK_VERSION=current
Bug: 37342627
Change-Id: Ie1507e9b5bdb626fa0049faadd225c2c1f451661
---
 stack/Android.bp                           | 3 +++
 vendor_libs/linux/interface/h4_protocol.cc | 1 +
 vendor_libs/test_vendor_lib/Android.bp     | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/stack/Android.bp b/stack/Android.bp
index 134198fc9..5cb567895 100644
--- a/stack/Android.bp
+++ b/stack/Android.bp
@@ -19,6 +19,9 @@ cc_library_static {
         "smp",
         "srvc",
     ],
+    header_libs: [
+        "libhardware_headers",
+    ],
     include_dirs: [
         "external/aac/libAACenc/include",
         "external/aac/libSYS/include",
diff --git a/vendor_libs/linux/interface/h4_protocol.cc b/vendor_libs/linux/interface/h4_protocol.cc
index 99aeb74eb..e7acff46d 100644
--- a/vendor_libs/linux/interface/h4_protocol.cc
+++ b/vendor_libs/linux/interface/h4_protocol.cc
@@ -20,6 +20,7 @@
 #include <android-base/logging.h>
 #include <assert.h>
 #include <fcntl.h>
+#include <sys/uio.h>
 #include <utils/Log.h>
 
 namespace android {
diff --git a/vendor_libs/test_vendor_lib/Android.bp b/vendor_libs/test_vendor_lib/Android.bp
index e190a6f26..18498ed0c 100644
--- a/vendor_libs/test_vendor_lib/Android.bp
+++ b/vendor_libs/test_vendor_lib/Android.bp
@@ -24,6 +24,9 @@ cc_library_static {
         "include",
     ],
     export_include_dirs: ["include"],
+    header_libs: [
+        "libhardware_headers",
+    ],
     include_dirs: [
         "system/bt",
         "system/bt/utils/include",
-- 
2.11.0