Canonically include stack/gatt::

Bug: 183374320
Test: gd/cert/run
Tag: #refactor

Change-Id: I5bb782f3d019535cd53129cfe450bb233c912975

diff --git a/stack/gatt/gatt_auth.cc b/stack/gatt/gatt_auth.cc
index c3aed25..c27ba61 100644 (file)
--- a/stack/gatt/gatt_auth.cc
+++ b/stack/gatt/gatt_auth.cc
@@ -27,12 +27,12 @@
 #include <string.h>
 #include "bt_common.h"
 
-#include "btm_int.h"
 #include "gatt_api.h"
 #include "gatt_int.h"
 #include "osi/include/osi.h"
 #include "stack/btm/btm_ble_int.h"
 #include "stack/btm/btm_ble_int_types.h"
+#include "stack/btm/btm_int.h"
 #include "stack/btm/btm_sec.h"
 
 using base::StringPrintf;

diff --git a/stack/gatt/gatt_cl.cc b/stack/gatt/gatt_cl.cc
index b70a880..1c7f4db 100644 (file)
--- a/stack/gatt/gatt_cl.cc
+++ b/stack/gatt/gatt_cl.cc
@@ -29,11 +29,11 @@
 #include "bt_common.h"
 #include "bt_target.h"
 #include "bt_utils.h"
-#include "eatt.h"
 #include "gatt_int.h"
 #include "l2c_api.h"
 #include "osi/include/log.h"
 #include "osi/include/osi.h"
+#include "stack/eatt/eatt.h"
 
 #define GATT_WRITE_LONG_HDR_SIZE 5 /* 1 opcode + 2 handle + 2 offset */
 #define GATT_READ_CHAR_VALUE_HDL (GATT_READ_CHAR_VALUE | 0x80)

diff --git a/stack/gatt/gatt_main.cc b/stack/gatt/gatt_main.cc
index 322653b..c77f993 100644 (file)
--- a/stack/gatt/gatt_main.cc
+++ b/stack/gatt/gatt_main.cc
@@ -26,15 +26,15 @@
 
 #include "bt_common.h"
 #include "bt_utils.h"
-#include "btif_storage.h"
-#include "btm_ble_int.h"
+#include "btif/include/btif_storage.h"
 #include "connection_manager.h"
 #include "device/include/interop.h"
-#include "eatt.h"
 #include "l2c_api.h"
 #include "osi/include/osi.h"
+#include "stack/btm/btm_ble_int.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_sec.h"
+#include "stack/eatt/eatt.h"
 #include "stack/gatt/gatt_int.h"
 #include "stack/include/l2cap_acl_interface.h"
 

diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index e637eb2..c0aedfa 100644 (file)
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -28,9 +28,9 @@
 
 #include "gatt_int.h"
 #include "l2c_api.h"
-#include "l2c_int.h"
 #include "osi/include/log.h"
 #include "stack/eatt/eatt.h"
+#include "stack/l2cap/l2c_int.h"
 #define GATT_MTU_REQ_MIN_LEN 2
 
 using base::StringPrintf;