Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41d4378a authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

IA2: Straighten out stack::sdp header inclusion am: 1da1161e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2761308



Change-Id: Ia68b3eb7d11a5220c545f8a3970dec0541724e30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4679605f 1da1161e

system/gd/common/init_flags.h

+0 −2
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 


#pragma once



#include <stdexcept>

#include <string>

#include <unordered_map>



#include "src/init_flags.rs.h"

system/stack/include/sdp_callback.h

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


#pragma once



#include <cstdint>



#include "stack/include/sdp_status.h"

#include "types/raw_address.h"

system/stack/sdp/internal/sdp_api.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <cstdint>



#include "sdpdefs.h"

#include "stack/include/sdp_callback.h"

#include "stack/sdp/sdp_discovery_db.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

system/stack/sdp/sdp_db.cc

+1 −2
Original line number Diff line number Diff line
@@ -30,10 +30,9 @@ 
#include "bt_target.h"

#include "osi/include/allocator.h"

#include "stack/include/bt_types.h"

#include "stack/include/sdp_api.h"

#include "stack/include/sdpdefs.h"

#include "stack/sdp/sdp_discovery_db.h"

#include "stack/sdp/sdpint.h"

#include "types/bluetooth/uuid.h"



/******************************************************************************/

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */

system/stack/sdp/sdp_discovery.cc

+2 −2
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ 
#include <cstdint>



#include "bt_target.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/sdp_api.h"

#include "stack/include/sdpdefs.h"

#include "stack/sdp/sdp_discovery_db.h"

#include "stack/sdp/sdpint.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"