Fix build issues in bluedroid on master

Change-Id: I0d3e93ea61dd03505fe9db902ed90bdd4141cab2

22 files changed, 38 insertions, 6 deletions

diff --git a/btcore/src/property.c b/btcore/src/property.c
index ddefb682a..ca4df5c18 100644
--- a/btcore/src/property.c
+++ b/btcore/src/property.c
@@ -17,6 +17,7 @@
  ******************************************************************************/
 
 #include <assert.h>
+#include <string.h>
 #include "btcore/include/bdaddr.h"
 #include "btcore/include/device_class.h"
 #include "btcore/include/property.h"
diff --git a/btif/co/bta_hh_co.c b/btif/co/bta_hh_co.c
index 4edf52b4a..5ca4fc3ab 100644
--- a/btif/co/bta_hh_co.c
+++ b/btif/co/bta_hh_co.c
@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <linux/uhid.h>
+#include <unistd.h>
 #include "btif_hh.h"
 #include "bta_api.h"
 #include "bta_hh_api.h"
diff --git a/btif/include/btif_sock_util.h b/btif/include/btif_sock_util.h
index 0659930da..6e504f9bc 100644
--- a/btif/include/btif_sock_util.h
+++ b/btif/include/btif_sock_util.h
@@ -45,16 +45,22 @@ static inline void init_slot_lock( pthread_mutex_t* mutex)
 
 static inline void lock_slot(pthread_mutex_t* mutex)
 {
-    if(mutex->value)
+    // TODO: Commented out since definition of pthread_mutext_t changed to remove value.
+    // Check is for a programming error - however, should re-implement if there's a 
+    // solution.
+    //if(mutex->value)
         pthread_mutex_lock(mutex);
-    else LOG_ERROR("mutex: %p is not initialized", mutex);
+    //else LOG_ERROR("mutex: %p is not initialized", mutex);
 }
 
 static inline void unlock_slot(pthread_mutex_t* mutex)
 {
-   if(mutex->value)
+    // TODO: Commented out since definition of pthread_mutext_t changed to remove value.
+    // Check is for a programming error - however, should re-implement if there's a 
+    // solution.
+    //if(mutex->value)
         pthread_mutex_unlock(mutex);
-   else LOG_ERROR("mutex: %p is not initialized", mutex);
+    //else LOG_ERROR("mutex: %p is not initialized", mutex);
 }
 
 void dump_bin(const char* title, const char* data, int size);
diff --git a/btif/src/btif_sock_rfc.c b/btif/src/btif_sock_rfc.c
index 1cd25a390..4b9040ebe 100644
--- a/btif/src/btif_sock_rfc.c
+++ b/btif/src/btif_sock_rfc.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <hardware/bluetooth.h>
 #include <hardware/bt_sock.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
diff --git a/btif/src/btif_sock_sco.c b/btif/src/btif_sock_sco.c
index 2c6be49d3..fafb45299 100644
--- a/btif/src/btif_sock_sco.c
+++ b/btif/src/btif_sock_sco.c
@@ -19,8 +19,10 @@
 #define LOG_TAG "bt_btif_sock_sco"
 
 #include <assert.h>
+#include <errno.h>
 #include <hardware/bluetooth.h>
 #include <hardware/bt_sock.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
diff --git a/btif/src/btif_sock_sdp.c b/btif/src/btif_sock_sdp.c
index 1fcae8f4f..5e833a6b5 100644
--- a/btif/src/btif_sock_sdp.c
+++ b/btif/src/btif_sock_sdp.c
@@ -20,6 +20,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
diff --git a/gki/common/gki_buffer.c b/gki/common/gki_buffer.c
index 78f08d90f..893d19f6a 100644
--- a/gki/common/gki_buffer.c
+++ b/gki/common/gki_buffer.c
@@ -17,6 +17,7 @@
  ******************************************************************************/
 
 #include <assert.h>
+#include <stdlib.h>
 
 #include "osi/include/allocator.h"
 #include "gki_int.h"
diff --git a/gki/ulinux/gki_ulinux.c b/gki/ulinux/gki_ulinux.c
index c928fbd60..72ad479e0 100644
--- a/gki/ulinux/gki_ulinux.c
+++ b/gki/ulinux/gki_ulinux.c
@@ -19,7 +19,9 @@
 #define LOG_TAG "bt_gki"
 
 #include <assert.h>
+#include <errno.h>
 #include <pthread.h>
+#include <string.h>
 #include <time.h>
 
 #include "btcore/include/module.h"
diff --git a/hci/src/btsnoop.c b/hci/src/btsnoop.c
index 869b075ca..011d9264f 100644
--- a/hci/src/btsnoop.c
+++ b/hci/src/btsnoop.c
@@ -18,12 +18,14 @@
 
 #define LOG_TAG "bt_snoop"
 
+#include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/hci/src/hci_hal_h4.c b/hci/src/hci_hal_h4.c
index 368b1aa94..836937d45 100644
--- a/hci/src/hci_hal_h4.c
+++ b/hci/src/hci_hal_h4.c
@@ -19,6 +19,8 @@
 #define LOG_TAG "bt_hci_h4"
 
 #include <assert.h>
+#include <errno.h>
+#include <string.h>
 
 #include "osi/include/eager_reader.h"
 #include "hci_hal.h"
diff --git a/hci/src/hci_hal_mct.c b/hci/src/hci_hal_mct.c
index d831e9314..9b3707c7f 100644
--- a/hci/src/hci_hal_mct.c
+++ b/hci/src/hci_hal_mct.c
@@ -19,6 +19,8 @@
 #define LOG_TAG "bt_hci_mct"
 
 #include <assert.h>
+#include <errno.h>
+#include <string.h>
 
 #include "bt_vendor_lib.h"
 #include "osi/include/eager_reader.h"
diff --git a/hci/src/hci_inject.c b/hci/src/hci_inject.c
index 0ec4f8286..169295bbe 100644
--- a/hci/src/hci_inject.c
+++ b/hci/src/hci_inject.c
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <string.h>
 
 #include "osi/include/allocator.h"
 #include "bt_types.h"
diff --git a/hci/src/hci_layer.c b/hci/src/hci_layer.c
index e78f4680e..37c674d08 100644
--- a/hci/src/hci_layer.c
+++ b/hci/src/hci_layer.c
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <cutils/properties.h>
+#include <string.h>
 
 #include "buffer_allocator.h"
 #include "btsnoop.h"
diff --git a/hci/src/packet_fragmenter.c b/hci/src/packet_fragmenter.c
index b09cf08ab..de6366809 100644
--- a/hci/src/packet_fragmenter.c
+++ b/hci/src/packet_fragmenter.c
@@ -19,6 +19,7 @@
 #define LOG_TAG "bt_hci_packet_fragmenter"
 
 #include <assert.h>
+#include <string.h>
 
 #include "buffer_allocator.h"
 #include "device/include/controller.h"
diff --git a/osi/src/allocation_tracker.c b/osi/src/allocation_tracker.c
index baa820bb7..381d5ea78 100644
--- a/osi/src/allocation_tracker.c
+++ b/osi/src/allocation_tracker.c
@@ -21,6 +21,8 @@
 #include <assert.h>
 #include <pthread.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "osi/include/allocation_tracker.h"
 #include "osi/include/allocator.h"
diff --git a/osi/src/allocator.c b/osi/src/allocator.c
index cd291b049..7ebeb5eea 100644
--- a/osi/src/allocator.c
+++ b/osi/src/allocator.c
@@ -17,6 +17,7 @@
  ******************************************************************************/
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "osi/include/allocator.h"
 #include "osi/include/allocation_tracker.h"
diff --git a/osi/src/array.c b/osi/src/array.c
index fb11887fd..c2ef1bc75 100644
--- a/osi/src/array.c
+++ b/osi/src/array.c
@@ -19,6 +19,8 @@
 #define LOG_TAG "bt_osi_array"
 
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "osi/include/allocator.h"
 #include "osi/include/array.h"
diff --git a/osi/src/eager_reader.c b/osi/src/eager_reader.c
index f12175457..6f0a88fec 100644
--- a/osi/src/eager_reader.c
+++ b/osi/src/eager_reader.c
@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stddef.h>
+#include <string.h>
 #include <sys/eventfd.h>
 
 #include "osi/include/allocator.h"
diff --git a/osi/src/fixed_queue.c b/osi/src/fixed_queue.c
index c83c516e6..009e18537 100644
--- a/osi/src/fixed_queue.c
+++ b/osi/src/fixed_queue.c
@@ -27,7 +27,7 @@
 #include "osi/include/semaphore.h"
 #include "osi/include/reactor.h"
 
-struct fixed_queue_t {
+typedef struct fixed_queue_t {
   list_t *list;
   semaphore_t *enqueue_sem;
   semaphore_t *dequeue_sem;
diff --git a/osi/src/list.c b/osi/src/list.c
index 75f948e60..f5f588970 100644
--- a/osi/src/list.c
+++ b/osi/src/list.c
@@ -9,7 +9,7 @@ struct list_node_t {
   void *data;
 };
 
-struct list_t {
+typedef struct list_t {
   list_node_t *head;
   list_node_t *tail;
   size_t length;
diff --git a/osi/src/reactor.c b/osi/src/reactor.c
index 968fe4bba..18f749ce8 100644
--- a/osi/src/reactor.c
+++ b/osi/src/reactor.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/epoll.h>
 #include <sys/eventfd.h>
 
diff --git a/stack/l2cap/l2cap_client.c b/stack/l2cap/l2cap_client.c
index 6e671fcf2..95b8e0131 100644
--- a/stack/l2cap/l2cap_client.c
+++ b/stack/l2cap/l2cap_client.c
@@ -19,6 +19,7 @@
 #define LOG_TAG "bt_l2cap_client"
 
 #include <assert.h>
+#include <string.h>
 
 #include "btcore/include/bdaddr.h"
 #include "gki/common/gki.h"