From 928cf290c8fabf4fba347c6c142bb190452502d6 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Mon, 6 Nov 2023 12:52:14 -0800
Subject: [PATCH] Properly include stack::sdp_device_id

Bug: 309512879
Test: m .

Change-Id: I5fd1a60dae87a57448e8f10c7fcbbf6cc79928cd
---
 system/bta/include/bta_api.h         | 4 ++--
 system/stack/include/sdp_device_id.h | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index 90d5e03b719..92c93606b9b 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -33,12 +33,12 @@
 
 #include "bt_target.h"  // Must be first to define build configuration
 #include "bta_api_data_types.h"
-#include "osi/include/log.h"
+#include "os/log.h"
 #include "stack/include/bt_name.h"
 #include "stack/include/btm_api_types.h"
 #include "stack/include/btm_ble_api_types.h"
 #include "stack/include/hci_error_code.h"
-#include "stack/include/sdp_api.h"
+#include "stack/include/sdp_device_id.h"
 #include "types/ble_address_with_type.h"
 #include "types/bluetooth/uuid.h"
 #include "types/bt_transport.h"
diff --git a/system/stack/include/sdp_device_id.h b/system/stack/include/sdp_device_id.h
index cb0f3fe44f2..8544e2c9f18 100644
--- a/system/stack/include/sdp_device_id.h
+++ b/system/stack/include/sdp_device_id.h
@@ -21,7 +21,6 @@
 #include <cstdint>
 
 #include "bt_target.h"
-#include "stack/include/sdp_status.h"
 
 /* Device Identification (DI) data structure
  */
-- 
GitLab