summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Couillaud <pierre@broadcom.com>2018-02-16 23:36:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-16 23:36:21 +0000
commitd89aaf8745608203cd300a07434bcdd1b3809957 (patch)
tree56ae7a036130f7f3f195e3d8775f02760a0c1599
parenta84d1fada0bc41446c5dd46e9565a52b7a1319a3 (diff)
parent93258f74b1f3dd73fdf3be02ec861ddf5a6c911b (diff)
downloadlibbt-d89aaf8745608203cd300a07434bcdd1b3809957.tar.gz
Merge "libbt: fixup build errors when building the library under vndk." am: 5763f5e96e
am: 93258f74b1 Change-Id: Ib4328d98b3c6ab830389a9e35704a6c21462c400
-rw-r--r--Android.mk2
-rw-r--r--src/conf.c1
-rw-r--r--src/hardware.c2
-rw-r--r--src/upio.c3
-rw-r--r--src/userial_vendor.c1
5 files changed, 9 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 62451d7..2d74845 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,6 +43,8 @@ LOCAL_C_INCLUDES += \
LOCAL_C_INCLUDES += $(bdroid_C_INCLUDES)
LOCAL_CFLAGS += $(bdroid_CFLAGS)
+LOCAL_HEADER_LIBRARIES := libutils_headers
+
ifneq ($(BOARD_HAVE_BLUETOOTH_BCM_A2DP_OFFLOAD),)
LOCAL_STATIC_LIBRARIES := libbt-brcm_a2dp
endif
diff --git a/src/conf.c b/src/conf.c
index 39ac12e..c28c4f1 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -30,6 +30,7 @@
#include <utils/Log.h>
#include <string.h>
#include "bt_vendor_brcm.h"
+#include <stdio.h>
/******************************************************************************
** Externs
diff --git a/src/hardware.c b/src/hardware.c
index 93def07..da9b918 100644
--- a/src/hardware.c
+++ b/src/hardware.c
@@ -41,6 +41,8 @@
#include <cutils/properties.h>
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
#include "bt_hci_bdroid.h"
#include "bt_vendor_brcm.h"
#include "esco_parameters.h"
diff --git a/src/upio.c b/src/upio.c
index d24d496..1a88e28 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -36,6 +36,9 @@
#include "bt_vendor_brcm.h"
#include "upio.h"
#include "userial_vendor.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <time.h>
/******************************************************************************
** Constants & Macros
diff --git a/src/userial_vendor.c b/src/userial_vendor.c
index 3ff518b..c727061 100644
--- a/src/userial_vendor.c
+++ b/src/userial_vendor.c
@@ -35,6 +35,7 @@
#include "bt_vendor_brcm.h"
#include "userial.h"
#include "userial_vendor.h"
+#include <unistd.h>
/******************************************************************************
** Constants & Macros