diff options
author | Steven Moreland <smoreland@google.com> | 2018-03-28 17:08:21 -0700 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2018-03-28 17:08:21 -0700 |
commit | c3236d6d9f6aa72bc087d168a6f27f9c56a145e1 (patch) | |
tree | f9fe08ef2b7be7cafe92d5c4233a401c6afb1ea8 | |
parent | e29295aeefc1f6adec5acab4429e05797e01d4c2 (diff) | |
download | bt-c3236d6d9f6aa72bc087d168a6f27f9c56a145e1.tar.gz |
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: 69574580
Change-Id: Ibb9a236de3059612e414b17d160ddac9168ef536
-rw-r--r-- | libbt-vendor/src/bt_vendor_persist.cpp | 2 | ||||
-rwxr-xr-x | libbt-vendor/src/bt_vendor_qcom.c | 4 | ||||
-rw-r--r-- | libbt-vendor/src/hardware.c | 3 | ||||
-rw-r--r-- | libbt-vendor/src/hci_smd.c | 3 | ||||
-rw-r--r-- | libbt-vendor/src/hci_uart.c | 3 | ||||
-rw-r--r-- | libbt-vendor/src/hw_ar3k.c | 4 | ||||
-rw-r--r-- | libbt-vendor/src/hw_rome.c | 5 |
7 files changed, 16 insertions, 8 deletions
diff --git a/libbt-vendor/src/bt_vendor_persist.cpp b/libbt-vendor/src/bt_vendor_persist.cpp index 519e826..8505797 100644 --- a/libbt-vendor/src/bt_vendor_persist.cpp +++ b/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/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c index 59b7f82..3468df4 100755 --- a/libbt-vendor/src/bt_vendor_qcom.c +++ b/libbt-vendor/src/bt_vendor_qcom.c @@ -26,7 +26,7 @@ #define LOG_TAG "bt_vendor" #define BLUETOOTH_MAC_ADDR_BOOT_PROPERTY "ro.boot.btmacaddr" -#include <utils/Log.h> +#include <log/log.h> #include <cutils/properties.h> #include <fcntl.h> #include <termios.h> @@ -36,6 +36,8 @@ #include "bt_vendor_qcom.h" #include "hci_uart.h" #include "hci_smd.h" +#include <pthread.h> +#include <unistd.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <cutils/sockets.h> diff --git a/libbt-vendor/src/hardware.c b/libbt-vendor/src/hardware.c index 90db801..5881612 100644 --- a/libbt-vendor/src/hardware.c +++ b/libbt-vendor/src/hardware.c @@ -26,7 +26,7 @@ #define LOG_TAG "bt_vendor" -#include <utils/Log.h> +#include <log/log.h> #include <sys/types.h> #include <sys/stat.h> #include <signal.h> @@ -37,6 +37,7 @@ #include <ctype.h> #include <cutils/properties.h> #include <stdlib.h> +#include <unistd.h> #include "bt_hci_bdroid.h" #include "bt_vendor_qcom.h" #include <string.h> diff --git a/libbt-vendor/src/hci_smd.c b/libbt-vendor/src/hci_smd.c index 7e5b16d..48ec780 100644 --- a/libbt-vendor/src/hci_smd.c +++ b/libbt-vendor/src/hci_smd.c @@ -24,11 +24,12 @@ #define LOG_TAG "bt_vendor" -#include <utils/Log.h> +#include <log/log.h> #include <termios.h> #include <fcntl.h> #include <errno.h> #include <stdio.h> +#include <unistd.h> #include "bt_vendor_qcom.h" #include "hci_smd.h" #include <string.h> diff --git a/libbt-vendor/src/hci_uart.c b/libbt-vendor/src/hci_uart.c index 2aeace8..76d39f4 100644 --- a/libbt-vendor/src/hci_uart.c +++ b/libbt-vendor/src/hci_uart.c @@ -26,11 +26,12 @@ #define LOG_TAG "bt_vendor" -#include <utils/Log.h> +#include <log/log.h> #include <termios.h> #include <fcntl.h> #include <errno.h> #include <stdio.h> +#include <unistd.h> #include "bt_vendor_qcom.h" #include "hci_uart.h" #include <string.h> diff --git a/libbt-vendor/src/hw_ar3k.c b/libbt-vendor/src/hw_ar3k.c index cc54db8..77fe52c 100644 --- a/libbt-vendor/src/hw_ar3k.c +++ b/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> @@ -48,6 +49,7 @@ extern "C" { #include <stdlib.h> #include <termios.h> #include <string.h> +#include <unistd.h> #include "bt_hci_bdroid.h" #include "bt_vendor_qcom.h" diff --git a/libbt-vendor/src/hw_rome.c b/libbt-vendor/src/hw_rome.c index ccfb137..1be4803 100644 --- a/libbt-vendor/src/hw_rome.c +++ b/libbt-vendor/src/hw_rome.c @@ -34,8 +34,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> @@ -49,6 +48,8 @@ extern "C" { #include <termios.h> #include <string.h> #include <stdbool.h> +#include <sys/socket.h> +#include <unistd.h> #include "bt_hci_bdroid.h" #include "bt_vendor_qcom.h" #include "hci_uart.h" |