From 92ea0af0d61ff80a315793cdbeaa25be769fd986 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 28 Feb 2015 22:39:35 -0800
Subject: [PATCH] android: Use local libbluetooth includes

---
 android/avctp.c     |  4 ++--
 android/avdtptest.c | 10 +++++-----
 android/bas.c       |  2 ++
 android/dis.c       |  2 ++
 android/hog.c       |  8 ++++----
 android/scpp.c      |  2 ++
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/android/avctp.c b/android/avctp.c
index a70ed5201..758dbd4ed 100644
--- a/android/avctp.c
+++ b/android/avctp.c
@@ -40,10 +40,10 @@
 #include <fcntl.h>
 #include <netinet/in.h>
 
-#include <bluetooth/sdp.h>
-
 #include <glib.h>
 
+#include "lib/sdp.h"
+
 #include "src/log.h"
 #include "src/uinput.h"
 
diff --git a/android/avdtptest.c b/android/avdtptest.c
index 652942337..f42f66488 100644
--- a/android/avdtptest.c
+++ b/android/avdtptest.c
@@ -32,14 +32,14 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-
 #include <glib.h>
 
-#include "src/shared/util.h"
+#include "lib/bluetooth.h"
+#include "lib/hci.h"
+#include "lib/hci_lib.h"
+
 #include "btio/btio.h"
+#include "src/shared/util.h"
 #include "src/shared/queue.h"
 #include "avdtp.h"
 
diff --git a/android/bas.c b/android/bas.c
index b6891ab21..dcbf9de7d 100644
--- a/android/bas.c
+++ b/android/bas.c
@@ -33,7 +33,9 @@
 #include "src/log.h"
 
 #include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
 
diff --git a/android/dis.c b/android/dis.c
index 8f8027eba..75dbe3d30 100644
--- a/android/dis.c
+++ b/android/dis.c
@@ -32,7 +32,9 @@
 #include "src/log.h"
 
 #include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
 
diff --git a/android/hog.c b/android/hog.c
index 3bfe7653c..88a5460ae 100644
--- a/android/hog.c
+++ b/android/hog.c
@@ -36,16 +36,16 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <bluetooth/bluetooth.h>
-
 #include <glib.h>
 
-#include "src/log.h"
-
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/uhid.h"
 #include "src/shared/queue.h"
+#include "src/log.h"
 
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
diff --git a/android/scpp.c b/android/scpp.c
index 4c6c0ecb6..f8f81f379 100644
--- a/android/scpp.c
+++ b/android/scpp.c
@@ -34,7 +34,9 @@
 #include "src/log.h"
 
 #include "lib/bluetooth.h"
+#include "lib/sdp.h"
 #include "lib/uuid.h"
+
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
 
-- 
2.47.3