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

Commit 07148bdf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Properly include osi_allocator" am: 58d124df 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1822159

Change-Id: I96611b8b89a1a89d7fc779e1a64a98cf2476b655
parents 631c251f 58d124df

system/bta/av/bta_av_aact.cc

+2 −1
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ 
#define LOG_TAG "bt_bta_av"



#include <base/strings/stringprintf.h>



#include <cstdint>

#include <cstring>

#include <vector>



#include "bt_target.h"  // Must be first to define build configuration



#include "bta/av/bta_av_int.h"

#include "bta/include/bta_ar_api.h"

#include "bta/include/bta_av_co.h"
@@ -42,6 +42,7 @@ 
#include "btif/include/btif_storage.h"

#include "device/include/interop.h"

#include "main/shim/dumpsys.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <cstdint>



#include "bt_target.h"  // Must be first to define build configuration



#include "bta/av/bta_av_int.h"

#include "bta/include/bta_ar_api.h"

#include "bta/include/utl.h"
@@ -35,6 +34,7 @@ 
#include "btif/include/btif_av_co.h"

#include "btif/include/btif_config.h"

#include "main/shim/dumpsys.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

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

#include "osi/include/properties.h"

system/bta/dm/bta_dm_act.cc

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "main/shim/btm_api.h"

#include "main/shim/dumpsys.h"

#include "main/shim/shim.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"

#include "osi/include/fixed_queue.h"

#include "osi/include/log.h"

system/bta/gatt/bta_gattc_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ 
#include <base/strings/stringprintf.h>



#include "bt_target.h"  // Must be first to define build configuration



#include "bta/gatt/bta_gattc_int.h"

#include "bta/hh/bta_hh_int.h"

#include "btif/include/btif_debug_conn.h"

#include "device/include/controller.h"

#include "main/shim/dumpsys.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

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

#include "stack/include/btm_ble_api_types.h"

system/bta/gatt/bta_gattc_api.cc

+2 −1
Original line number Diff line number Diff line
@@ -23,15 +23,16 @@ 
 ******************************************************************************/



#include <base/bind.h>



#include <ios>

#include <list>

#include <memory>

#include <vector>



#include "bt_target.h"  // Must be first to define build configuration



#include "bta/gatt/bta_gattc_int.h"

#include "device/include/controller.h"

#include "osi/include/allocator.h"

#include "stack/include/btu.h"  // do_in_main_thread

#include "types/bluetooth/uuid.h"

#include "types/bt_transport.h"