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

Commit 6c3e0c4b authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Remove gd prefix from include paths" into main am: 759108b3 

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



Change-Id: I5cf712ff87af88b9c4abb2d9f0de222928cbf54f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e48e881 759108b3

system/bta/ag/bta_ag_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ 


#include "btif/include/btif_config.h"

#include "device/include/device_iot_config.h"

#include "gd/storage/config_keys.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_sec_api_types.h"

#include "stack/include/l2c_api.h"

#include "stack/include/port_api.h"

#include "stack/include/sdp_api.h"

#include "storage/config_keys.h"

#include "types/raw_address.h"



using namespace bluetooth::legacy::stack::sdp;

system/bta/ag/bta_ag_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "common/init_flags.h"

#include "device/include/interop.h"

#include "device/include/interop_config.h"

#include "gd/storage/config_keys.h"

#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/allocator.h"
@@ -44,6 +43,7 @@ 
#include "stack/include/bt_uuid16.h"

#include "stack/include/main_thread.h"

#include "stack/include/sdp_api.h"

#include "storage/config_keys.h"

#include "types/bluetooth/uuid.h"



using namespace bluetooth::legacy::stack::sdp;

system/bta/av/bta_av_aact.cc

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include "btif/include/btif_storage.h"

#include "device/include/device_iot_config.h"

#include "device/include/interop.h"

#include "gd/storage/config_keys.h"

#include "include/check.h"

#include "internal_include/bt_target.h"

#include "osi/include/allocator.h"
@@ -58,6 +57,7 @@ 
#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/l2c_api.h"

#include "storage/config_keys.h"

#include "types/hci_role.h"

#include "types/raw_address.h"

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "btif/include/btif_av.h"

#include "btif/include/btif_av_co.h"

#include "btif/include/btif_config.h"

#include "gd/storage/config_keys.h"

#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/allocator.h"
@@ -48,6 +47,7 @@ 
#include "stack/include/bt_uuid16.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/sdp_api.h"

#include "storage/config_keys.h"

#include "types/hci_role.h"

#include "types/raw_address.h"

system/bta/dm/bta_dm_disc.cc

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "common/init_flags.h"

#include "common/strings.h"

#include "device/include/interop.h"

#include "gd/storage/config_keys.h"

#include "include/bind_helpers.h"

#include "include/check.h"

#include "internal_include/bt_target.h"
@@ -58,6 +57,7 @@ 
#include "stack/include/hidh_api.h"

#include "stack/include/sdp_status.h"

#include "stack/sdp/sdpint.h"  // is_sdp_pbap_pce_disabled

#include "storage/config_keys.h"

#include "types/raw_address.h"



#ifdef TARGET_FLOSS