From a08df697bc2d31bd2859fb9fe82840db12bccd4b Mon Sep 17 00:00:00 2001
From: Sharvil Nanavati <sharvil@google.com>
Date: Thu, 12 Mar 2015 15:42:50 -0700
Subject: [PATCH] Use fully qualified path for OSI includes.
---
gki/common/gki_buffer.c | 2 +-
system/bta/av/bta_av_act.c | 2 +-
system/bta/sys/bta_sys_main.c | 10 +++++-----
system/btcore/src/counter.c | 14 +++++++-------
system/btcore/src/module.c | 6 +++---
system/btif/src/bluetooth.c | 2 +-
system/btif/src/btif_config.c | 6 +++---
system/btif/src/btif_core.c | 8 ++++----
system/btif/src/btif_hl.c | 2 +-
system/btif/src/btif_media_task.c | 2 +-
system/btif/src/btif_pan.c | 2 +-
system/btif/src/btif_profile_queue.c | 2 +-
system/btif/src/btif_sm.c | 2 +-
system/btif/src/btif_sock.c | 4 ++--
system/btif/src/btif_sock_rfc.c | 4 ++--
system/btif/src/btif_sock_sco.c | 8 ++++----
system/btif/src/btif_storage.c | 4 ++--
system/btif/src/stack_manager.c | 6 +++---
system/device/src/controller.c | 2 +-
system/hci/src/btsnoop_net.c | 2 +-
system/hci/src/hci_hal_h4.c | 6 +++---
system/hci/src/hci_hal_mct.c | 6 +++---
system/hci/src/hci_inject.c | 10 +++++-----
system/hci/src/hci_layer.c | 12 ++++++------
system/hci/src/hci_packet_factory.c | 2 +-
system/hci/src/low_power_manager.c | 6 +++---
system/hci/src/packet_fragmenter.c | 4 ++--
system/hci/src/vendor.c | 2 +-
system/main/bte_conf.c | 2 +-
system/main/bte_logmsg.c | 2 +-
system/main/bte_main.c | 14 +++++++-------
system/main/stack_config.c | 2 +-
system/osi/src/alarm.c | 8 ++++----
system/osi/src/allocation_tracker.c | 10 +++++-----
system/osi/src/allocator.c | 4 ++--
system/osi/src/array.c | 4 ++--
system/osi/src/config.c | 6 +++---
system/osi/src/data_dispatcher.c | 10 +++++-----
system/osi/src/eager_reader.c | 12 ++++++------
system/osi/src/fixed_queue.c | 12 ++++++------
system/osi/src/future.c | 8 ++++----
system/osi/src/hash_functions.c | 2 +-
system/osi/src/hash_map.c | 2 +-
system/osi/src/list.c | 6 +++---
system/osi/src/non_repeating_timer.c | 6 +++---
system/osi/src/reactor.c | 6 +++---
system/osi/src/semaphore.c | 6 +++---
system/osi/src/socket.c | 8 ++++----
system/osi/src/thread.c | 12 ++++++------
system/stack/btm/btm_devctl.c | 2 +-
system/stack/btu/btu_hcif.c | 2 +-
system/stack/btu/btu_init.c | 8 ++++----
system/stack/btu/btu_task.c | 12 ++++++------
system/tools/hci/Android.mk | 2 +-
system/tools/hci/main.c | 2 +-
55 files changed, 154 insertions(+), 154 deletions(-)
diff --git a/gki/common/gki_buffer.c b/gki/common/gki_buffer.c
index 577709a4ab6..78f08d90fb6 100644
--- a/gki/common/gki_buffer.c
+++ b/gki/common/gki_buffer.c
@@ -18,7 +18,7 @@
#include <assert.h>
-#include "allocator.h"
+#include "osi/include/allocator.h"
#include "gki_int.h"
#if (GKI_NUM_TOTAL_BUF_POOLS > 16)
diff --git a/system/bta/av/bta_av_act.c b/system/bta/av/bta_av_act.c
index a86e43a477c..9d14d251948 100644
--- a/system/bta/av/bta_av_act.c
+++ b/system/bta/av/bta_av_act.c
@@ -32,7 +32,7 @@
#include "avdt_api.h"
#include "utl.h"
#include "l2c_api.h"
-#include "list.h"
+#include "osi/include/list.h"
#if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
#include "bta_ar_api.h"
#endif
diff --git a/system/bta/sys/bta_sys_main.c b/system/bta/sys/bta_sys_main.c
index c697fce79df..47997233faa 100644
--- a/system/bta/sys/bta_sys_main.c
+++ b/system/bta/sys/bta_sys_main.c
@@ -26,19 +26,19 @@
#include <assert.h>
#include <string.h>
-#include "alarm.h"
+#include "osi/include/alarm.h"
#include "btm_api.h"
#include "bta_api.h"
#include "bta_sys.h"
#include "bta_sys_int.h"
-#include "fixed_queue.h"
+#include "osi/include/fixed_queue.h"
#include "gki.h"
-#include "hash_map.h"
-#include "osi.h"
+#include "osi/include/hash_map.h"
+#include "osi/include/osi.h"
#include "osi/include/hash_functions.h"
#include "osi/include/log.h"
-#include "thread.h"
+#include "osi/include/thread.h"
#if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE)
#include "bta_ar_api.h"
#endif
diff --git a/system/btcore/src/counter.c b/system/btcore/src/counter.c
index dbd6794a311..70c734626dd 100644
--- a/system/btcore/src/counter.c
+++ b/system/btcore/src/counter.c
@@ -24,17 +24,17 @@
#include <string.h>
#include <sys/eventfd.h>
-#include "allocator.h"
-#include "atomic.h"
+#include "osi/include/allocator.h"
+#include "osi/include/atomic.h"
#include "counter.h"
-#include "hash_map.h"
-#include "list.h"
+#include "osi/include/hash_map.h"
+#include "osi/include/list.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/hash_functions.h"
#include "osi/include/log.h"
-#include "socket.h"
-#include "thread.h"
+#include "osi/include/socket.h"
+#include "osi/include/thread.h"
typedef int (*handler_t)(socket_t * socket);
diff --git a/system/btcore/src/module.c b/system/btcore/src/module.c
index ea7c117072a..87a8c3d07c3 100644
--- a/system/btcore/src/module.c
+++ b/system/btcore/src/module.c
@@ -22,10 +22,10 @@
#include <dlfcn.h>
#include <pthread.h>
-#include "allocator.h"
-#include "hash_map.h"
+#include "osi/include/allocator.h"
+#include "osi/include/hash_map.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/hash_functions.h"
#include "osi/include/log.h"
diff --git a/system/btif/src/bluetooth.c b/system/btif/src/bluetooth.c
index e9c29b3b97c..c6f550cd9e4 100644
--- a/system/btif/src/bluetooth.c
+++ b/system/btif/src/bluetooth.c
@@ -46,7 +46,7 @@
#include "btif_api.h"
#include "btsnoop.h"
#include "bt_utils.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/allocation_tracker.h"
#include "osi/include/log.h"
#include "stack_manager.h"
diff --git a/system/btif/src/btif_config.c b/system/btif/src/btif_config.c
index 71a7c0725e0..7e8e58a8020 100644
--- a/system/btif/src/btif_config.c
+++ b/system/btif/src/btif_config.c
@@ -24,14 +24,14 @@
#include <stdio.h>
#include <string.h>
-#include "alarm.h"
+#include "osi/include/alarm.h"
#include "bdaddr.h"
#include "btif_config.h"
#include "btif_config_transcode.h"
#include "btif_util.h"
-#include "config.h"
+#include "osi/include/config.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "bt_types.h"
diff --git a/system/btif/src/btif_core.c b/system/btif/src/btif_core.c
index 16db8681a2c..6bfed41cf09 100644
--- a/system/btif/src/btif_core.c
+++ b/system/btif/src/btif_core.c
@@ -53,13 +53,13 @@
#include "btif_util.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "fixed_queue.h"
-#include "future.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/future.h"
#include "gki.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "stack_manager.h"
-#include "thread.h"
+#include "osi/include/thread.h"
/************************************************************************************
** Constants & Macros
diff --git a/system/btif/src/btif_hl.c b/system/btif/src/btif_hl.c
index 2420fe81334..1d7394de16c 100644
--- a/system/btif/src/btif_hl.c
+++ b/system/btif/src/btif_hl.c
@@ -68,7 +68,7 @@
#include "btif_util.h"
#include "btu.h"
#include "gki.h"
-#include "list.h"
+#include "osi/include/list.h"
#include "mca_api.h"
#include "osi/include/log.h"
diff --git a/system/btif/src/btif_media_task.c b/system/btif/src/btif_media_task.c
index 30ef3a4cd7d..2ff7664418f 100644
--- a/system/btif/src/btif_media_task.c
+++ b/system/btif/src/btif_media_task.c
@@ -41,7 +41,7 @@
#include <errno.h>
#include "bt_target.h"
-#include "fixed_queue.h"
+#include "osi/include/fixed_queue.h"
#include "gki.h"
#include "bta_api.h"
#include "btu.h"
diff --git a/system/btif/src/btif_pan.c b/system/btif/src/btif_pan.c
index d842d8aeefb..678679bccaf 100644
--- a/system/btif/src/btif_pan.c
+++ b/system/btif/src/btif_pan.c
@@ -59,7 +59,7 @@
#include "btif_sock_util.h"
#include "btif_pan_internal.h"
#include "gki.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#define FORWARD_IGNORE 1
diff --git a/system/btif/src/btif_profile_queue.c b/system/btif/src/btif_profile_queue.c
index f2e428db752..0d3e49e1958 100644
--- a/system/btif/src/btif_profile_queue.c
+++ b/system/btif/src/btif_profile_queue.c
@@ -31,7 +31,7 @@
#include "btif_common.h"
#include "btif_profile_queue.h"
#include "gki.h"
-#include "list.h"
+#include "osi/include/list.h"
#include "osi/include/allocator.h"
#include "stack_manager.h"
diff --git a/system/btif/src/btif_sm.c b/system/btif/src/btif_sm.c
index 03159fe7c14..f8b4fea51bd 100644
--- a/system/btif/src/btif_sm.c
+++ b/system/btif/src/btif_sm.c
@@ -29,7 +29,7 @@
#include <hardware/bluetooth.h>
-#include "allocator.h"
+#include "osi/include/allocator.h"
#include "btif_common.h"
#include "btif_sm.h"
#include "gki.h"
diff --git a/system/btif/src/btif_sock.c b/system/btif/src/btif_sock.c
index 3ab95c922aa..072132489df 100644
--- a/system/btif/src/btif_sock.c
+++ b/system/btif/src/btif_sock.c
@@ -28,9 +28,9 @@
#include "btif_sock_sco.h"
#include "btif_sock_thread.h"
#include "btif_util.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "thread.h"
+#include "osi/include/thread.h"
static bt_status_t btsock_listen(btsock_type_t type, const char *service_name, const uint8_t *uuid, int channel, int *sock_fd, int flags);
static bt_status_t btsock_connect(const bt_bdaddr_t *bd_addr, btsock_type_t type, const uint8_t *uuid, int channel, int *sock_fd, int flags);
diff --git a/system/btif/src/btif_sock_rfc.c b/system/btif/src/btif_sock_rfc.c
index 5b2b775cd52..50ed08d64e0 100644
--- a/system/btif/src/btif_sock_rfc.c
+++ b/system/btif/src/btif_sock_rfc.c
@@ -40,8 +40,8 @@
#include "btu.h"
#include "gki.h"
#include "hcimsgs.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "port_api.h"
#include "sdp_api.h"
diff --git a/system/btif/src/btif_sock_sco.c b/system/btif/src/btif_sock_sco.c
index 9608e117fa5..26d37dcd8cb 100644
--- a/system/btif/src/btif_sock_sco.c
+++ b/system/btif/src/btif_sock_sco.c
@@ -25,11 +25,11 @@
#include <sys/types.h>
#include "btif_common.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "socket.h"
-#include "thread.h"
+#include "osi/include/socket.h"
+#include "osi/include/thread.h"
// This module provides a socket abstraction for SCO connections to a higher
// layer. It returns file descriptors representing two types of sockets:
diff --git a/system/btif/src/btif_storage.c b/system/btif/src/btif_storage.c
index 9a3bb558651..47ef1d7f59e 100644
--- a/system/btif/src/btif_storage.c
+++ b/system/btif/src/btif_storage.c
@@ -42,9 +42,9 @@
#include "btif_storage.h"
#include "btif_util.h"
#include "bdaddr.h"
-#include "config.h"
+#include "osi/include/config.h"
#include "gki.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "bta_hh_api.h"
#include "btif_hh.h"
#include "osi/include/log.h"
diff --git a/system/btif/src/stack_manager.c b/system/btif/src/stack_manager.c
index 13a3d420375..836f1a4325c 100644
--- a/system/btif/src/stack_manager.c
+++ b/system/btif/src/stack_manager.c
@@ -24,11 +24,11 @@
#include "btif_common.h"
#include "device/include/controller.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "semaphore.h"
+#include "osi/include/semaphore.h"
#include "stack_manager.h"
-#include "thread.h"
+#include "osi/include/thread.h"
// Temp includes
#include "btif_config.h"
diff --git a/system/device/src/controller.c b/system/device/src/controller.c
index 43e16e447b1..23d86c3f298 100644
--- a/system/device/src/controller.c
+++ b/system/device/src/controller.c
@@ -25,7 +25,7 @@
#include "bt_types.h"
#include "device/include/controller.h"
#include "event_mask.h"
-#include "future.h"
+#include "osi/include/future.h"
#include "hcimsgs.h"
#include "hci/include/hci_layer.h"
#include "hci/include/hci_packet_factory.h"
diff --git a/system/hci/src/btsnoop_net.c b/system/hci/src/btsnoop_net.c
index bac99fba5e3..1db4f3a060a 100644
--- a/system/hci/src/btsnoop_net.c
+++ b/system/hci/src/btsnoop_net.c
@@ -28,7 +28,7 @@
#include <sys/socket.h>
#include <sys/types.h>
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
static void safe_close_(int *fd);
diff --git a/system/hci/src/hci_hal_h4.c b/system/hci/src/hci_hal_h4.c
index 89c3f1cc769..368b1aa944b 100644
--- a/system/hci/src/hci_hal_h4.c
+++ b/system/hci/src/hci_hal_h4.c
@@ -20,11 +20,11 @@
#include <assert.h>
-#include "eager_reader.h"
+#include "osi/include/eager_reader.h"
#include "hci_hal.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "reactor.h"
+#include "osi/include/reactor.h"
#include "vendor.h"
#define HCI_HAL_SERIAL_BUFFER_SIZE 1026
diff --git a/system/hci/src/hci_hal_mct.c b/system/hci/src/hci_hal_mct.c
index 6ba742e9403..d831e931405 100644
--- a/system/hci/src/hci_hal_mct.c
+++ b/system/hci/src/hci_hal_mct.c
@@ -21,11 +21,11 @@
#include <assert.h>
#include "bt_vendor_lib.h"
-#include "eager_reader.h"
+#include "osi/include/eager_reader.h"
#include "hci_hal.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "reactor.h"
+#include "osi/include/reactor.h"
#include "vendor.h"
#define HCI_HAL_SERIAL_BUFFER_SIZE 1026
diff --git a/system/hci/src/hci_inject.c b/system/hci/src/hci_inject.c
index bf9fc5c2e3c..0ec4f8286e2 100644
--- a/system/hci/src/hci_inject.c
+++ b/system/hci/src/hci_inject.c
@@ -21,16 +21,16 @@
#include <assert.h>
#include <errno.h>
-#include "allocator.h"
+#include "osi/include/allocator.h"
#include "bt_types.h"
#include "buffer_allocator.h"
#include "hci_inject.h"
#include "hci_layer.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "socket.h"
-#include "thread.h"
+#include "osi/include/socket.h"
+#include "osi/include/thread.h"
typedef enum {
HCI_PACKET_COMMAND = 1,
diff --git a/system/hci/src/hci_layer.c b/system/hci/src/hci_layer.c
index 30e69a9d903..87f47f25c2f 100644
--- a/system/hci/src/hci_layer.c
+++ b/system/hci/src/hci_layer.c
@@ -23,22 +23,22 @@
#include "buffer_allocator.h"
#include "btsnoop.h"
-#include "fixed_queue.h"
-#include "future.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/future.h"
#include "hcidefs.h"
#include "hcimsgs.h"
#include "hci_hal.h"
#include "hci_internals.h"
#include "hci_inject.h"
#include "hci_layer.h"
-#include "list.h"
+#include "osi/include/list.h"
#include "low_power_manager.h"
#include "module.h"
-#include "non_repeating_timer.h"
-#include "osi.h"
+#include "osi/include/non_repeating_timer.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "packet_fragmenter.h"
-#include "reactor.h"
+#include "osi/include/reactor.h"
#include "vendor.h"
// TODO(zachoverflow): remove this hack extern
diff --git a/system/hci/src/hci_packet_factory.c b/system/hci/src/hci_packet_factory.c
index d2180c954a9..032823dd3f8 100644
--- a/system/hci/src/hci_packet_factory.c
+++ b/system/hci/src/hci_packet_factory.c
@@ -18,7 +18,7 @@
#include <assert.h>
-#include "allocator.h"
+#include "osi/include/allocator.h"
#include "bt_types.h"
#include "buffer_allocator.h"
#include "hcidefs.h"
diff --git a/system/hci/src/low_power_manager.c b/system/hci/src/low_power_manager.c
index f5780212f0f..9435e4fe1c4 100644
--- a/system/hci/src/low_power_manager.c
+++ b/system/hci/src/low_power_manager.c
@@ -21,11 +21,11 @@
#include <assert.h>
#include <stdint.h>
-#include "alarm.h"
+#include "osi/include/alarm.h"
#include "low_power_manager.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "thread.h"
+#include "osi/include/thread.h"
#include "vendor.h"
typedef enum {
diff --git a/system/hci/src/packet_fragmenter.c b/system/hci/src/packet_fragmenter.c
index 0893f3ad048..b09cf08ab7c 100644
--- a/system/hci/src/packet_fragmenter.c
+++ b/system/hci/src/packet_fragmenter.c
@@ -22,11 +22,11 @@
#include "buffer_allocator.h"
#include "device/include/controller.h"
-#include "hash_map.h"
+#include "osi/include/hash_map.h"
#include "hci_internals.h"
#include "hci_layer.h"
#include "packet_fragmenter.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/hash_functions.h"
#include "osi/include/log.h"
diff --git a/system/hci/src/vendor.c b/system/hci/src/vendor.c
index 24b739de18a..2e220e4a709 100644
--- a/system/hci/src/vendor.c
+++ b/system/hci/src/vendor.c
@@ -23,7 +23,7 @@
#include "buffer_allocator.h"
#include "bt_vendor_lib.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "vendor.h"
diff --git a/system/main/bte_conf.c b/system/main/bte_conf.c
index c66f4ab0e51..31a9a64c544 100644
--- a/system/main/bte_conf.c
+++ b/system/main/bte_conf.c
@@ -23,7 +23,7 @@
#include <string.h>
#include "bta_api.h"
-#include "config.h"
+#include "osi/include/config.h"
#include "osi/include/log.h"
#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
diff --git a/system/main/bte_logmsg.c b/system/main/bte_logmsg.c
index d37cf5da284..c976254bd5f 100644
--- a/system/main/bte_logmsg.c
+++ b/system/main/bte_logmsg.c
@@ -27,7 +27,7 @@
#include "bte.h"
#include "bta_api.h"
#include "btu.h"
-#include "config.h"
+#include "osi/include/config.h"
#include "gki.h"
#include "l2c_api.h"
#include "osi/include/log.h"
diff --git a/system/main/bte_main.c b/system/main/bte_main.c
index be8b2bfde3e..2f15baaf329 100755
--- a/system/main/bte_main.c
+++ b/system/main/bte_main.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <time.h>
-#include "alarm.h"
+#include "osi/include/alarm.h"
#include "bta_api.h"
#include "bt_hci_bdroid.h"
#include "bte.h"
@@ -44,17 +44,17 @@
#include "btsnoop.h"
#include "bt_utils.h"
#include "counter.h"
-#include "fixed_queue.h"
-#include "future.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/future.h"
#include "gki.h"
-#include "hash_functions.h"
-#include "hash_map.h"
+#include "osi/include/hash_functions.h"
+#include "osi/include/hash_map.h"
#include "hci_layer.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "stack_config.h"
-#include "thread.h"
+#include "osi/include/thread.h"
/*******************************************************************************
** Constants & Macros
diff --git a/system/main/stack_config.c b/system/main/stack_config.c
index d71ee44577f..6e1431ee466 100644
--- a/system/main/stack_config.c
+++ b/system/main/stack_config.c
@@ -20,7 +20,7 @@
#include <assert.h>
-#include "future.h"
+#include "osi/include/future.h"
#include "stack_config.h"
#include "osi/include/log.h"
diff --git a/system/osi/src/alarm.c b/system/osi/src/alarm.c
index cf2246c52c1..1b2e7e5c2f7 100644
--- a/system/osi/src/alarm.c
+++ b/system/osi/src/alarm.c
@@ -24,10 +24,10 @@
#include <inttypes.h>
#include <time.h>
-#include "allocator.h"
-#include "alarm.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/alarm.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
struct alarm_t {
diff --git a/system/osi/src/allocation_tracker.c b/system/osi/src/allocation_tracker.c
index 08212762014..c6a43030137 100644
--- a/system/osi/src/allocation_tracker.c
+++ b/system/osi/src/allocation_tracker.c
@@ -22,11 +22,11 @@
#include <pthread.h>
#include <stdint.h>
-#include "allocation_tracker.h"
-#include "allocator.h"
-#include "hash_functions.h"
-#include "hash_map.h"
-#include "osi.h"
+#include "osi/include/allocation_tracker.h"
+#include "osi/include/allocator.h"
+#include "osi/include/hash_functions.h"
+#include "osi/include/hash_map.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
typedef struct {
diff --git a/system/osi/src/allocator.c b/system/osi/src/allocator.c
index 27080c7176a..cd291b04971 100644
--- a/system/osi/src/allocator.c
+++ b/system/osi/src/allocator.c
@@ -18,8 +18,8 @@
#include <stdlib.h>
-#include "allocator.h"
-#include "allocation_tracker.h"
+#include "osi/include/allocator.h"
+#include "osi/include/allocation_tracker.h"
static const allocator_id_t alloc_allocator_id = 42;
diff --git a/system/osi/src/array.c b/system/osi/src/array.c
index c9416f03645..33fa38ccea8 100644
--- a/system/osi/src/array.c
+++ b/system/osi/src/array.c
@@ -20,8 +20,8 @@
#include <assert.h>
-#include "allocator.h"
-#include "array.h"
+#include "osi/include/allocator.h"
+#include "osi/include/array.h"
#include "osi/include/log.h"
struct array_t {
diff --git a/system/osi/src/config.c b/system/osi/src/config.c
index 5f17299c5f5..1944bb30ca1 100644
--- a/system/osi/src/config.c
+++ b/system/osi/src/config.c
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <string.h>
-#include "allocator.h"
-#include "config.h"
-#include "list.h"
+#include "osi/include/allocator.h"
+#include "osi/include/config.h"
+#include "osi/include/list.h"
#include "osi/include/log.h"
typedef struct {
diff --git a/system/osi/src/data_dispatcher.c b/system/osi/src/data_dispatcher.c
index 5d2b5065a09..4f27f8a9162 100644
--- a/system/osi/src/data_dispatcher.c
+++ b/system/osi/src/data_dispatcher.c
@@ -20,11 +20,11 @@
#include <assert.h>
-#include "allocator.h"
-#include "data_dispatcher.h"
-#include "hash_functions.h"
-#include "hash_map.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/data_dispatcher.h"
+#include "osi/include/hash_functions.h"
+#include "osi/include/hash_map.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#define DEFAULT_TABLE_BUCKETS 10
diff --git a/system/osi/src/eager_reader.c b/system/osi/src/eager_reader.c
index 5cd76149af9..887fe1a3893 100644
--- a/system/osi/src/eager_reader.c
+++ b/system/osi/src/eager_reader.c
@@ -23,13 +23,13 @@
#include <stddef.h>
#include <sys/eventfd.h>
-#include "allocator.h"
-#include "eager_reader.h"
-#include "fixed_queue.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/eager_reader.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "reactor.h"
-#include "thread.h"
+#include "osi/include/reactor.h"
+#include "osi/include/thread.h"
#if !defined(EFD_SEMAPHORE)
# define EFD_SEMAPHORE (1 << 0)
diff --git a/system/osi/src/fixed_queue.c b/system/osi/src/fixed_queue.c
index 1a325378769..009e185370a 100644
--- a/system/osi/src/fixed_queue.c
+++ b/system/osi/src/fixed_queue.c
@@ -20,12 +20,12 @@
#include <pthread.h>
#include <stdlib.h>
-#include "allocator.h"
-#include "fixed_queue.h"
-#include "list.h"
-#include "osi.h"
-#include "semaphore.h"
-#include "reactor.h"
+#include "osi/include/allocator.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
+#include "osi/include/semaphore.h"
+#include "osi/include/reactor.h"
typedef struct fixed_queue_t {
list_t *list;
diff --git a/system/osi/src/future.c b/system/osi/src/future.c
index bfe8db26e5c..230218fa2fa 100644
--- a/system/osi/src/future.c
+++ b/system/osi/src/future.c
@@ -20,11 +20,11 @@
#include <assert.h>
-#include "allocator.h"
-#include "future.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/future.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "semaphore.h"
+#include "osi/include/semaphore.h"
struct future_t {
bool ready_can_be_called;
diff --git a/system/osi/src/hash_functions.c b/system/osi/src/hash_functions.c
index f279bd45648..e7e7cefb74a 100644
--- a/system/osi/src/hash_functions.c
+++ b/system/osi/src/hash_functions.c
@@ -18,7 +18,7 @@
#include <string.h>
-#include "hash_functions.h"
+#include "osi/include/hash_functions.h"
hash_index_t hash_function_naive(const void *key) {
return (hash_index_t)key;
diff --git a/system/osi/src/hash_map.c b/system/osi/src/hash_map.c
index 4581f98d2d4..6d36ec3a15d 100644
--- a/system/osi/src/hash_map.c
+++ b/system/osi/src/hash_map.c
@@ -20,7 +20,7 @@
#include <list.h>
#include <hash_map.h>
-#include "allocator.h"
+#include "osi/include/allocator.h"
struct hash_map_t;
diff --git a/system/osi/src/list.c b/system/osi/src/list.c
index 5c38a8f31f4..a9701aacce5 100644
--- a/system/osi/src/list.c
+++ b/system/osi/src/list.c
@@ -1,8 +1,8 @@
#include <assert.h>
-#include "allocator.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
typedef struct list_node_t {
struct list_node_t *next;
diff --git a/system/osi/src/non_repeating_timer.c b/system/osi/src/non_repeating_timer.c
index 0c32e3d1435..e5e95d4ea6b 100644
--- a/system/osi/src/non_repeating_timer.c
+++ b/system/osi/src/non_repeating_timer.c
@@ -18,9 +18,9 @@
#include <assert.h>
-#include "allocator.h"
-#include "osi.h"
-#include "non_repeating_timer.h"
+#include "osi/include/allocator.h"
+#include "osi/include/osi.h"
+#include "osi/include/non_repeating_timer.h"
struct non_repeating_timer_t {
alarm_t *alarm;
diff --git a/system/osi/src/reactor.c b/system/osi/src/reactor.c
index 72a47ec6e74..968fe4bba85 100644
--- a/system/osi/src/reactor.c
+++ b/system/osi/src/reactor.c
@@ -25,10 +25,10 @@
#include <sys/epoll.h>
#include <sys/eventfd.h>
-#include "allocator.h"
-#include "list.h"
+#include "osi/include/allocator.h"
+#include "osi/include/list.h"
#include "osi/include/log.h"
-#include "reactor.h"
+#include "osi/include/reactor.h"
#if !defined(EFD_SEMAPHORE)
# define EFD_SEMAPHORE (1 << 0)
diff --git a/system/osi/src/semaphore.c b/system/osi/src/semaphore.c
index e1fa8a42c4a..4c45b2e5e50 100644
--- a/system/osi/src/semaphore.c
+++ b/system/osi/src/semaphore.c
@@ -24,10 +24,10 @@
#include <string.h>
#include <sys/eventfd.h>
-#include "allocator.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "semaphore.h"
+#include "osi/include/semaphore.h"
#if !defined(EFD_SEMAPHORE)
# define EFD_SEMAPHORE (1 << 0)
diff --git a/system/osi/src/socket.c b/system/osi/src/socket.c
index 8a1a75edf17..8841d56052b 100644
--- a/system/osi/src/socket.c
+++ b/system/osi/src/socket.c
@@ -28,11 +28,11 @@
#include <sys/types.h>
#include <unistd.h>
-#include "allocator.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "reactor.h"
-#include "socket.h"
+#include "osi/include/reactor.h"
+#include "osi/include/socket.h"
struct socket_t {
int fd;
diff --git a/system/osi/src/thread.c b/system/osi/src/thread.c
index 33c324a5c77..d60968b01e2 100644
--- a/system/osi/src/thread.c
+++ b/system/osi/src/thread.c
@@ -25,12 +25,12 @@
#include <sys/prctl.h>
#include <sys/types.h>
-#include "allocator.h"
-#include "fixed_queue.h"
-#include "log.h"
-#include "reactor.h"
-#include "semaphore.h"
-#include "thread.h"
+#include "osi/include/allocator.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/log.h"
+#include "osi/include/reactor.h"
+#include "osi/include/semaphore.h"
+#include "osi/include/thread.h"
struct thread_t {
bool is_joined;
diff --git a/system/stack/btm/btm_devctl.c b/system/stack/btm/btm_devctl.c
index 688f8b9b682..8a24db9fd5a 100644
--- a/system/stack/btm/btm_devctl.c
+++ b/system/stack/btm/btm_devctl.c
@@ -38,7 +38,7 @@
#include "hcimsgs.h"
#include "l2c_int.h"
#include "module.h"
-#include "thread.h"
+#include "osi/include/thread.h"
#if BLE_INCLUDED == TRUE
#include "gatt_int.h"
diff --git a/system/stack/btu/btu_hcif.c b/system/stack/btu/btu_hcif.c
index cadcb849b57..c7c52829d81 100644
--- a/system/stack/btu/btu_hcif.c
+++ b/system/stack/btu/btu_hcif.c
@@ -40,7 +40,7 @@
#include "btm_api.h"
#include "btm_int.h"
#include "bt_utils.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "hci_layer.h"
diff --git a/system/stack/btu/btu_init.c b/system/stack/btu/btu_init.c
index 723c428990f..0888cb57ea8 100644
--- a/system/stack/btu/btu_init.c
+++ b/system/stack/btu/btu_init.c
@@ -25,15 +25,15 @@
#include <string.h>
#include "dyn_mem.h"
-#include "alarm.h"
+#include "osi/include/alarm.h"
#include "device/include/controller.h"
-#include "fixed_queue.h"
-#include "hash_map.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/hash_map.h"
#include "btu.h"
#include "btm_int.h"
#include "osi/include/hash_functions.h"
#include "sdpint.h"
-#include "thread.h"
+#include "osi/include/thread.h"
#include "l2c_int.h"
#include "osi/include/log.h"
diff --git a/system/stack/btu/btu_task.c b/system/stack/btu/btu_task.c
index 6cef4fb7ccc..458faa09f03 100644
--- a/system/stack/btu/btu_task.c
+++ b/system/stack/btu/btu_task.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <string.h>
-#include "alarm.h"
+#include "osi/include/alarm.h"
#include "bt_target.h"
#include "bt_trace.h"
#include "bt_types.h"
@@ -32,17 +32,17 @@
#include "btm_api.h"
#include "btm_int.h"
#include "btu.h"
-#include "fixed_queue.h"
-#include "future.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/future.h"
#include "gki.h"
-#include "hash_map.h"
+#include "osi/include/hash_map.h"
#include "hcimsgs.h"
#include "l2c_int.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "sdpint.h"
-#include "thread.h"
+#include "osi/include/thread.h"
#include "port_api.h"
#include "port_ext.h"
diff --git a/system/tools/hci/Android.mk b/system/tools/hci/Android.mk
index c20b1679644..9477db3073e 100644
--- a/system/tools/hci/Android.mk
+++ b/system/tools/hci/Android.mk
@@ -24,6 +24,6 @@ LOCAL_MODULE := net_hci
LOCAL_SRC_FILES := main.c
LOCAL_STATIC_LIBRARIES := libosi
LOCAL_CFLAGS := -std=c99 $(bdroid_CFLAGS)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../osi/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../
include $(BUILD_EXECUTABLE)
diff --git a/system/tools/hci/main.c b/system/tools/hci/main.c
index 844f2882983..fc433bcda6c 100644
--- a/system/tools/hci/main.c
+++ b/system/tools/hci/main.c
@@ -6,7 +6,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "osi.h"
+#include "osi/include/osi.h"
typedef int (*handler_t)(int argc, char **argv);
--
GitLab