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

Commit 5b373155 authored by Chris Manton's avatar Chris Manton
Browse files

gd: Re-include assorted files 

Bug: 314828950
Test: atest bluetooth_test_gd_unit
Flag: EXEMPT, IWYU

Change-Id: Ia72215155ae21b8ac99792ae48f02b60b7f868f7
parent 052bfbe4

system/gd/hal/snoop_logger.cc

+4 −4
Original line number Diff line number Diff line
@@ -28,17 +28,17 @@ 
#include "common/init_flags.h"

#include "common/strings.h"

#include "hal/snoop_logger_common.h"

#include "hal/syscall_wrapper_impl.h"

#include "os/fake_timer/fake_timerfd.h"

#include "os/files.h"

#include "os/log.h"

#include "os/parameter_provider.h"

#include "os/system_properties.h"



namespace bluetooth {

#ifdef USE_FAKE_TIMERS

using os::fake_timer::fake_timerfd_get_clock;

#include "os/fake_timer/fake_timerfd.h"

using bluetooth::os::fake_timer::fake_timerfd_get_clock;

#endif



namespace bluetooth {

namespace hal {



// Adds L2CAP channel to acceptlist.

system/gd/hal/snoop_logger.h

+1 −2
Original line number Diff line number Diff line
@@ -17,14 +17,13 @@ 
#pragma once



#include <fstream>

#include <iostream>

#include <mutex>

#include <string>

#include <unordered_map>

#include <unordered_set>



#include "common/circular_buffer.h"

#include "hal/hci_hal.h"

#include "hal/snoop_logger_socket_interface.h"

#include "hal/snoop_logger_socket_thread.h"

#include "hal/syscall_wrapper_impl.h"

#include "module.h"

system/gd/hci/controller.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "hci/hci_packets.h"

#include "hci/le_rand_callback.h"

#include "module.h"

#include "os/handler.h"



// TODO Remove this once all QTI specific hacks are removed.

#define LMP_COMPID_QTI 0x001D

system/stack/l2cap/l2c_csm.cc

+2 −3
Original line number Diff line number Diff line
@@ -30,12 +30,11 @@ 
#include <string>



#include "bt_target.h"

#include "common/time_util.h"

#include "gd/hal/snoop_logger.h"

#include "hal/snoop_logger.h"

#include "main/shim/entry.h"

#include "main/shim/metrics_api.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"