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

Commit 23934a0c authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Sanitize header include paths" into main am: 4f9eaf4a 

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



Change-Id: I97843fa52cfcf6041e73262e3ef60444d05721d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4328fae5 4f9eaf4a

tools/rootcanal/desktop/test_environment.cc

+25 −11
Original line number Diff line number Diff line
@@ -14,22 +14,36 @@ 
// limitations under the License.

//



#include "test_environment.h"

#include "desktop/test_environment.h"



#include <google/protobuf/text_format.h>



#include <filesystem>  // for exists

#include <type_traits>  // for remove_extent_t

#include <utility>      // for move

#include <vector>       // for vector



#include <chrono>

#include <filesystem>

#include <fstream>

#include <functional>

#include <future>

#include <ios>

#include <memory>

#include <string>

#include <utility>

#include <vector>



#include "hci/pcap_filter.h"

#include "log.h"

#include "model/controller/controller_properties.h"

#include "model/devices/baseband_sniffer.h"

#include "model/devices/link_layer_socket_device.h"  // for LinkLayerSocketDevice

#include "model/hci/hci_sniffer.h"                   // for HciSniffer

#include "model/hci/hci_socket_transport.h"          // for HciSocketTransport

#include "net/async_data_channel.h"                  // for AsyncDataChannel

#include "net/async_data_channel_connector.h"  // for AsyncDataChannelConnector

#include "model/devices/device.h"

#include "model/devices/hci_device.h"

#include "model/devices/link_layer_socket_device.h"

#include "model/hci/hci_sniffer.h"

#include "model/hci/hci_socket_transport.h"

#include "model/setup/async_manager.h"

#include "model/setup/test_channel_transport.h"

#include "net/async_data_channel.h"

#include "net/async_data_channel_connector.h"

#include "phy.h"

#include "rootcanal/configuration.pb.h"



namespace rootcanal {

tools/rootcanal/desktop/test_environment.h

+13 −11
Original line number Diff line number Diff line
@@ -16,17 +16,19 @@ 


#pragma once



#include <chrono>      // for milliseconds

#include <functional>  // for __base, function

#include <future>      // for promise

#include <memory>      // for shared_ptr, make_...

#include <string>      // for string



#include "model/setup/async_manager.h"              // for AsyncTaskId, Asyn...

#include "model/setup/test_channel_transport.h"     // for TestChannelTransport

#include "model/setup/test_command_handler.h"       // for TestCommandHandler

#include "model/setup/test_model.h"                 // for TestModel

#include "net/async_data_channel_server.h"          // for AsyncDataChannelS...

#include <chrono>

#include <functional>

#include <future>

#include <memory>

#include <string>

#include <vector>



#include "model/controller/controller_properties.h"

#include "model/setup/async_manager.h"

#include "model/setup/test_channel_transport.h"

#include "model/setup/test_command_handler.h"

#include "model/setup/test_model.h"

#include "net/async_data_channel_server.h"



namespace android::net {

class AsyncDataChannel;

tools/rootcanal/include/hci/address.h

+4 −4
Original line number Diff line number Diff line
@@ -20,15 +20,16 @@ 
#include <packet_runtime.h>



#include <array>

#include <cstdint>

#include <cstring>

#include <functional>

#include <initializer_list>

#include <optional>

#include <ostream>

#include <string>

#include <vector>



namespace bluetooth {

namespace hci {

namespace bluetooth::hci {



class Address final : public pdl::packet::Builder {

 public:
@@ -89,8 +90,7 @@ inline std::ostream& operator<<(std::ostream& os, const Address& a) { 
  return os;

}



}  // namespace hci

}  // namespace bluetooth

}  // namespace bluetooth::hci



namespace std {

template <>

tools/rootcanal/include/hci/address_with_type.h

+7 −4
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ 


#include <fmt/core.h>



#include <cstddef>

#include <cstdint>

#include <cstring>

#include <functional>

#include <ostream>

#include <sstream>

#include <string>

#include <utility>
@@ -26,8 +31,7 @@ 
#include "hci/address.h"

#include "packets/hci_packets.h"



namespace bluetooth {

namespace hci {

namespace bluetooth::hci {



class AddressWithType final {

 public:
@@ -120,8 +124,7 @@ inline std::ostream& operator<<(std::ostream& os, const AddressWithType& a) { 
  return os;

}



}  // namespace hci

}  // namespace bluetooth

}  // namespace bluetooth::hci



namespace std {

template <>

tools/rootcanal/include/hci/pcap_filter.h

+6 −2
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 


#pragma once



#include <packets/hci_packets.h>

#include <array>

#include <cstddef>

#include <cstdint>

#include <utility>

#include <vector>



#include <unordered_map>

#include "packets/hci_packets.h"



namespace rootcanal {