From 8bb54c1c42d44b6e3aed3d5b88e39477e4cce168 Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Tue, 6 Feb 2024 15:24:03 +0000 Subject: [PATCH] Penultimate split-up of rtc_p2p build target This takes the rest of the .cc files out of the rtc_p2p build target, leaving only one entangled target to clean up. Bug: webrtc:15796 Change-Id: I4312b70ffe96a8affc1a02456ac466eea05dd44c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338220 Commit-Queue: Harald Alvestrand Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#41676} --- examples/BUILD.gn | 2 + p2p/BUILD.gn | 335 +++++++++++++++++++++++++++--- pc/BUILD.gn | 35 ++++ rtc_tools/network_tester/BUILD.gn | 1 + test/fuzzers/BUILD.gn | 1 + test/network/BUILD.gn | 3 + test/pc/e2e/BUILD.gn | 1 + test/peer_scenario/BUILD.gn | 1 + 8 files changed, 347 insertions(+), 32 deletions(-) diff --git a/examples/BUILD.gn b/examples/BUILD.gn index c3f66e0b98..d6940e2cba 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -809,6 +809,7 @@ if (is_linux || is_chromeos || is_win) { sources = [ "turnserver/turnserver_main.cc" ] deps = [ ":read_auth_file", + "../p2p:basic_packet_socket_factory", "../p2p:p2p_server_utils", "../p2p:port_interface", "../p2p:rtc_p2p", @@ -951,6 +952,7 @@ if (!build_with_chromium) { testonly = true sources = [ "stunprober/main.cc" ] deps = [ + "../p2p:basic_packet_socket_factory", "../p2p:libstunprober", "../p2p:rtc_p2p", "../rtc_base:checks", diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 8a5c8df065..5b7f07e361 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -23,18 +23,13 @@ rtc_library("rtc_p2p") { "base/active_ice_controller_factory_interface.h", # To be removed (Chrome) "base/active_ice_controller_interface.h", # To be removed (Internal) "base/basic_ice_controller.h", # To be removed (Chrome) - "base/basic_packet_socket_factory.cc", - "base/basic_packet_socket_factory.h", + "base/basic_packet_socket_factory.h", # To be removed "base/candidate_pair_interface.h", # To be removed "base/connection.h", # To be removed "base/connection_info.h", # To be removed - "base/default_ice_transport_factory.cc", - "base/default_ice_transport_factory.h", - "base/dtls_transport.cc", - "base/dtls_transport.h", - "base/dtls_transport_factory.h", - "base/dtls_transport_internal.cc", - "base/dtls_transport_internal.h", + "base/default_ice_transport_factory.h", # To be removed (Chrome) + "base/dtls_transport.h", # To be removed + "base/dtls_transport_internal.h", # To be removed "base/ice_agent_interface.h", # To be removed (Chrome) "base/ice_controller_interface.h", # To be removed (Chrome) "base/ice_credentials_iterator.h", # To be removed @@ -47,25 +42,15 @@ rtc_library("rtc_p2p") { "base/port.h", # To be removed (Chrome) "base/port_allocator.h", # To be removed (Chrome) "base/port_interface.h", # To be removed - "base/pseudo_tcp.cc", - "base/pseudo_tcp.h", + "base/pseudo_tcp.h", # To be removed "base/stun_dictionary.h", # To be removed - "base/stun_port.cc", - "base/stun_port.h", - "base/tcp_port.cc", - "base/tcp_port.h", + "base/stun_port.h", # To be removed + "base/tcp_port.h", # To be removed "base/transport_description.h", # To be removed - "base/transport_description_factory.cc", - "base/transport_description_factory.h", - "base/transport_info.h", - "base/turn_port.cc", - "base/turn_port.h", - "base/udp_port.h", - "client/basic_port_allocator.cc", - "client/basic_port_allocator.h", - "client/relay_port_factory_interface.h", - "client/turn_port_factory.cc", - "client/turn_port_factory.h", + "base/transport_info.h", # To be removed + "base/turn_port.h", # To be removed + "client/basic_port_allocator.h", # To be removed + "client/turn_port_factory.h", # To be removed ] deps = [ @@ -73,9 +58,12 @@ rtc_library("rtc_p2p") { ":async_stun_tcp_socket", ":basic_async_resolver_factory", ":basic_ice_controller", + ":basic_packet_socket_factory", ":candidate_pair_interface", ":connection", ":connection_info", + ":dtls_transport", + ":dtls_transport_internal", ":ice_agent_interface", ":ice_controller_factory_interface", ":ice_controller_interface", @@ -87,10 +75,14 @@ rtc_library("rtc_p2p") { ":p2p_transport_channel_ice_field_trials", ":packet_transport_internal", ":port_interface", + ":pseudo_tcp", ":regathering_controller", + ":relay_port_factory_interface", ":stun_dictionary", ":stun_request", + ":tcp_port", ":transport_description", + ":udp_port", ":wrapping_active_ice_controller", "../api:array_view", "../api:async_dns_resolver", @@ -107,6 +99,7 @@ rtc_library("rtc_p2p") { "../api/crypto:options", "../api/rtc_event_log", "../api/task_queue", + "../api/task_queue:pending_task_safety_flag", "../api/transport:enums", "../api/transport:field_trial_based_config", "../api/transport:stun_types", @@ -139,6 +132,7 @@ rtc_library("rtc_p2p") { "../rtc_base:rate_tracker", "../rtc_base:refcount", "../rtc_base:rtc_numerics", + "../rtc_base:safe_minmax", "../rtc_base:socket", "../rtc_base:socket_adapters", "../rtc_base:socket_address", @@ -149,18 +143,14 @@ rtc_library("rtc_p2p") { "../rtc_base:stringutils", "../rtc_base:threading", "../rtc_base:timeutils", + "../rtc_base:weak_ptr", "../rtc_base/containers:flat_map", "../rtc_base/experiments:field_trial_parser", "../rtc_base/memory:always_valid_pointer", - "../rtc_base/system:no_unique_address", - - # Needed by pseudo_tcp, which should move to a separate target. - "../api/task_queue:pending_task_safety_flag", - "../rtc_base:safe_minmax", - "../rtc_base:weak_ptr", "../rtc_base/network:received_packet", "../rtc_base/network:sent_packet", "../rtc_base/synchronization:mutex", + "../rtc_base/system:no_unique_address", "../rtc_base/system:rtc_export", "../rtc_base/third_party/base64", "../rtc_base/third_party/sigslot", @@ -242,6 +232,32 @@ rtc_library("basic_ice_controller") { ] } +rtc_library("basic_packet_socket_factory") { + sources = [ + "base/basic_packet_socket_factory.cc", + "base/basic_packet_socket_factory.h", + ] + deps = [ + ":async_stun_tcp_socket", + "../api:async_dns_resolver", + "../api:packet_socket_factory", + "../rtc_base:async_dns_resolver", + "../rtc_base:async_packet_socket", + "../rtc_base:async_tcp_socket", + "../rtc_base:async_udp_socket", + "../rtc_base:checks", + "../rtc_base:logging", + "../rtc_base:proxy_info", + "../rtc_base:socket", + "../rtc_base:socket_adapters", + "../rtc_base:socket_address", + "../rtc_base:socket_factory", + "../rtc_base:ssl", + "../rtc_base/system:rtc_export", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] +} + rtc_source_set("candidate_pair_interface") { sources = [ "base/candidate_pair_interface.h" ] } @@ -331,6 +347,81 @@ rtc_library("connection_info") { absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } +rtc_library("default_ice_transport_factory") { + sources = [ + "base/default_ice_transport_factory.cc", + "base/default_ice_transport_factory.h", + ] + deps = [ + ":basic_ice_controller", + ":ice_controller_factory_interface", + ":p2p_transport_channel", + "../api:ice_transport_interface", + "../api:make_ref_counted", + "../rtc_base:threading", + ] +} + +rtc_library("dtls_transport") { + sources = [ + "base/dtls_transport.cc", + "base/dtls_transport.h", + ] + deps = [ + ":dtls_transport_internal", + ":ice_transport_internal", + ":packet_transport_internal", + "../api:array_view", + "../api:dtls_transport_interface", + "../api:sequence_checker", + "../api/crypto:options", + "../api/rtc_event_log", + "../logging:ice_log", + "../rtc_base:buffer", + "../rtc_base:buffer_queue", + "../rtc_base:checks", + "../rtc_base:dscp", + "../rtc_base:logging", + "../rtc_base:ssl", + "../rtc_base:stream", + "../rtc_base:stringutils", + "../rtc_base:threading", + "../rtc_base/system:no_unique_address", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/strings:string_view", + ] +} + +rtc_source_set("dtls_transport_factory") { + sources = [ "base/dtls_transport_factory.h" ] + deps = [ + ":dtls_transport_internal", + ":ice_transport_internal", + ] +} + +rtc_library("dtls_transport_internal") { + sources = [ + "base/dtls_transport_internal.cc", + "base/dtls_transport_internal.h", + ] + deps = [ + ":ice_transport_internal", + ":packet_transport_internal", + "../api:dtls_transport_interface", + "../api:scoped_refptr", + "../api/crypto:options", + "../rtc_base:callback_list", + "../rtc_base:ssl", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/base:core_headers", + "//third_party/abseil-cpp/absl/strings:string_view", + ] +} + rtc_source_set("ice_agent_interface") { sources = [ "base/ice_agent_interface.h" ] deps = [ @@ -616,6 +707,24 @@ rtc_library("port_interface") { ] } +rtc_library("pseudo_tcp") { + sources = [ + "base/pseudo_tcp.cc", + "base/pseudo_tcp.h", + ] + deps = [ + "../rtc_base:byte_buffer", + "../rtc_base:byte_order", + "../rtc_base:checks", + "../rtc_base:logging", + "../rtc_base:safe_minmax", + "../rtc_base:socket", + "../rtc_base:timeutils", + "../rtc_base/synchronization:mutex", + "../rtc_base/system:rtc_export", + ] +} + rtc_library("regathering_controller") { sources = [ "base/regathering_controller.cc", @@ -643,6 +752,35 @@ rtc_library("stun_dictionary") { ] } +rtc_library("stun_port") { + sources = [ + "base/stun_port.cc", + "base/stun_port.h", + ] + deps = [ + ":connection", + ":p2p_constants", + ":port", + ":port_allocator", + ":stun_request", + "../api/task_queue:pending_task_safety_flag", + "../api/transport:stun_types", + "../rtc_base:async_packet_socket", + "../rtc_base:checks", + "../rtc_base:ip_address", + "../rtc_base:logging", + "../rtc_base:ssl", + "../rtc_base:stringutils", + "../rtc_base/experiments:field_trial_parser", + "../rtc_base/network:received_packet", + "../rtc_base/system:rtc_export", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/strings:string_view", + ] +} + rtc_library("stun_request") { sources = [ "base/stun_request.cc", @@ -662,6 +800,34 @@ rtc_library("stun_request") { absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] } +rtc_library("tcp_port") { + sources = [ + "base/tcp_port.cc", + "base/tcp_port.h", + ] + deps = [ + ":connection", + ":p2p_constants", + ":port", + "../api/task_queue:pending_task_safety_flag", + "../api/units:time_delta", + "../rtc_base:async_packet_socket", + "../rtc_base:checks", + "../rtc_base:ip_address", + "../rtc_base:logging", + "../rtc_base:net_helper", + "../rtc_base:rate_tracker", + "../rtc_base:threading", + "../rtc_base/containers:flat_map", + "../rtc_base/network:received_packet", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/algorithm:container", + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/strings:string_view", + ] +} + rtc_library("transport_description") { sources = [ "base/transport_description.cc", @@ -684,6 +850,98 @@ rtc_library("transport_description") { ] } +rtc_library("transport_description_factory") { + sources = [ + "base/transport_description_factory.cc", + "base/transport_description_factory.h", + ] + deps = [ + ":ice_credentials_iterator", + ":rtc_p2p", + "../api:field_trials_view", + "../rtc_base:logging", + "../rtc_base:ssl", + ] +} + +rtc_source_set("transport_info") { + sources = [ "base/transport_info.h" ] + deps = [ + ":p2p_constants", + ":rtc_p2p", + "../api:candidate", + "../rtc_base:ssl", + ] +} + +rtc_source_set("udp_port") { + sources = [ "base/udp_port.h" ] + deps = [ ":stun_port" ] +} + +rtc_library("basic_port_allocator_and_turn_port") { + sources = [ + "base/turn_port.cc", + "base/turn_port.h", + "client/basic_port_allocator.cc", + "client/basic_port_allocator.h", + "client/turn_port_factory.cc", + "client/turn_port_factory.h", + ] + deps = [ + ":basic_packet_socket_factory", + ":connection", + ":p2p_constants", + ":port", + ":port_allocator", + ":relay_port_factory_interface", + ":stun_port", + ":tcp_port", + ":udp_port", + "../api:async_dns_resolver", + "../api:field_trials_view", + "../api:turn_customizer", + "../api/task_queue", + "../api/task_queue:pending_task_safety_flag", + "../api/transport:field_trial_based_config", + "../api/transport:stun_types", + "../api/units:time_delta", + "../rtc_base:async_packet_socket", + "../rtc_base:byte_order", + "../rtc_base:checks", + "../rtc_base:event_tracer", + "../rtc_base:logging", + "../rtc_base:macromagic", + "../rtc_base:net_helpers", + "../rtc_base:network", + "../rtc_base:network_constants", + "../rtc_base:socket_address", + "../rtc_base:ssl", + "../rtc_base:stringutils", + "../rtc_base:threading", + "../rtc_base/experiments:field_trial_parser", + "../rtc_base/memory:always_valid_pointer", + "../rtc_base/network:received_packet", + "../rtc_base/system:rtc_export", + "../system_wrappers:metrics", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/algorithm:container", + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/strings:string_view", + "//third_party/abseil-cpp/absl/types:optional", + ] +} + +rtc_source_set("relay_port_factory_interface") { + sources = [ "client/relay_port_factory_interface.h" ] + deps = [ + ":port_interface", + "../rtc_base:refcount", + ] +} + rtc_library("wrapping_active_ice_controller") { sources = [ "base/wrapping_active_ice_controller.cc", @@ -736,8 +994,10 @@ if (rtc_include_tests) { visibility = [ "*" ] sources = [ "base/fake_port_allocator.h" ] deps = [ + ":basic_packet_socket_factory", ":connection", ":rtc_p2p", + ":udp_port", "../rtc_base:net_helpers", "../rtc_base:net_test_helpers", "../rtc_base:task_queue_for_test", @@ -765,7 +1025,9 @@ if (rtc_include_tests) { deps = [ ":active_ice_controller_factory_interface", ":active_ice_controller_interface", + ":basic_packet_socket_factory", ":connection", + ":dtls_transport_internal", ":fake_ice_transport", ":fake_port_allocator", ":ice_agent_interface", @@ -833,7 +1095,10 @@ if (rtc_include_tests) { ":active_ice_controller_interface", ":async_stun_tcp_socket", ":basic_ice_controller", + ":basic_packet_socket_factory", + ":basic_port_allocator_and_turn_port", ":connection", + ":dtls_transport", ":fake_ice_transport", ":fake_port_allocator", ":ice_credentials_iterator", @@ -844,11 +1109,16 @@ if (rtc_include_tests) { ":p2p_transport_channel", ":packet_transport_internal", ":port_interface", + ":pseudo_tcp", ":regathering_controller", + ":relay_port_factory_interface", ":rtc_p2p", ":stun_dictionary", + ":stun_port", ":stun_request", + ":tcp_port", ":transport_description", + ":transport_description_factory", ":wrapping_active_ice_controller", "../api:array_view", "../api:candidate", @@ -981,6 +1251,7 @@ if (rtc_include_tests) { sources = [ "stunprober/stun_prober_unittest.cc" ] deps = [ + ":basic_packet_socket_factory", ":libstunprober", ":p2p_test_utils", ":rtc_p2p", diff --git a/pc/BUILD.gn b/pc/BUILD.gn index a426e9b8c5..92eae42a46 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -87,6 +87,7 @@ rtc_source_set("channel") { "../media:rtp_utils", "../media:stream_params", "../modules/rtp_rtcp:rtp_rtcp_format", + "../p2p:dtls_transport_internal", "../p2p:rtc_p2p", "../rtc_base:async_packet_socket", "../rtc_base:checks", @@ -134,6 +135,7 @@ rtc_source_set("dtls_srtp_transport") { "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../api:rtc_error", + "../p2p:dtls_transport_internal", "../p2p:packet_transport_internal", "../p2p:rtc_p2p", "../rtc_base:buffer", @@ -158,6 +160,8 @@ rtc_source_set("dtls_transport") { "../api:make_ref_counted", "../api:scoped_refptr", "../api:sequence_checker", + "../p2p:dtls_transport", + "../p2p:dtls_transport_internal", "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:logging", @@ -226,11 +230,14 @@ rtc_source_set("jsep_transport") { "../api:sequence_checker", "../api/transport:datagram_transport_interface", "../media:rtc_data_sctp_transport_internal", + "../p2p:dtls_transport", + "../p2p:dtls_transport_internal", "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_transport_channel", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_info", "../rtc_base:checks", "../rtc_base:copy_on_write_buffer", "../rtc_base:event_tracer", @@ -302,12 +309,16 @@ rtc_source_set("jsep_transport_controller") { "../api/transport:sctp_transport_factory_interface", "../media:rtc_data_sctp_transport_internal", "../p2p:connection", + "../p2p:dtls_transport", + "../p2p:dtls_transport_factory", + "../p2p:dtls_transport_internal", "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_transport_channel", "../p2p:packet_transport_internal", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_info", "../rtc_base:callback_list", "../rtc_base:checks", "../rtc_base:copy_on_write_buffer", @@ -363,6 +374,8 @@ rtc_source_set("media_session") { "../p2p:p2p_constants", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_description_factory", + "../p2p:transport_info", "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:ssl", @@ -522,6 +535,7 @@ rtc_source_set("sctp_transport") { "../api:sequence_checker", "../api/transport:datagram_transport_interface", "../media:rtc_data_sctp_transport_internal", + "../p2p:dtls_transport_internal", "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:logging", @@ -655,6 +669,7 @@ rtc_source_set("transport_stats") { "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../p2p:connection", + "../p2p:dtls_transport_internal", "../p2p:ice_transport_internal", "../p2p:rtc_p2p", "../rtc_base:ssl", @@ -714,6 +729,7 @@ rtc_source_set("session_description") { "../media:stream_params", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_info", "../rtc_base:checks", "../rtc_base:socket_address", "../rtc_base:stringutils", @@ -823,6 +839,7 @@ rtc_library("connection_context") { "../api/transport:sctp_transport_factory_interface", "../media:rtc_data_sctp_transport_factory", "../media:rtc_media_base", + "../p2p:basic_packet_socket_factory", "../p2p:rtc_p2p", "../rtc_base:checks", "../rtc_base:macromagic", @@ -1035,6 +1052,8 @@ rtc_source_set("sdp_offer_answer") { "../p2p:p2p_transport_channel", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_description_factory", + "../p2p:transport_info", "../rtc_base:checks", "../rtc_base:event_tracer", "../rtc_base:logging", @@ -1142,11 +1161,13 @@ rtc_source_set("peer_connection") { "../p2p:basic_async_resolver_factory", "../p2p:connection", "../p2p:connection_info", + "../p2p:dtls_transport_internal", "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_transport_channel", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_info", "../rtc_base:checks", "../rtc_base:copy_on_write_buffer", "../rtc_base:event_tracer", @@ -1202,6 +1223,7 @@ rtc_source_set("sdp_utils") { ":session_description", "../api:libjingle_peerconnection_api", "../p2p:rtc_p2p", + "../p2p:transport_info", "../rtc_base:checks", "../rtc_base/system:rtc_export", ] @@ -1321,6 +1343,7 @@ rtc_source_set("webrtc_sdp") { "../p2p:port_interface", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_info", "../rtc_base:checks", "../rtc_base:ip_address", "../rtc_base:logging", @@ -1356,6 +1379,7 @@ rtc_source_set("webrtc_session_description_factory") { "../api/task_queue", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_description_factory", "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:rtc_certificate_generator", @@ -1446,7 +1470,10 @@ rtc_source_set("peer_connection_factory") { "../call:rtp_interfaces", "../call:rtp_sender", "../media:rtc_media_base", + "../p2p:basic_packet_socket_factory", + "../p2p:basic_port_allocator_and_turn_port", "../p2p:connection", + "../p2p:default_ice_transport_factory", "../p2p:rtc_p2p", "../pc:audio_track", "../pc:connection_context", @@ -2078,6 +2105,8 @@ if (rtc_include_tests && !build_with_chromium) { "../media:rtc_media_tests_utils", "../modules/rtp_rtcp:rtp_rtcp_format", "../p2p:candidate_pair_interface", + "../p2p:dtls_transport_factory", + "../p2p:dtls_transport_internal", "../p2p:fake_ice_transport", "../p2p:fake_port_allocator", "../p2p:ice_transport_internal", @@ -2086,6 +2115,7 @@ if (rtc_include_tests && !build_with_chromium) { "../p2p:packet_transport_internal", "../p2p:rtc_p2p", "../p2p:transport_description", + "../p2p:transport_info", "../rtc_base:async_packet_socket", "../rtc_base:buffer", "../rtc_base:byte_order", @@ -2167,6 +2197,7 @@ if (rtc_include_tests && !build_with_chromium) { "../media:rtc_media_tests_utils", "../modules/audio_device:audio_device_api", "../modules/audio_processing:api", + "../p2p:basic_port_allocator_and_turn_port", "../p2p:connection", "../p2p:p2p_test_utils", "../p2p:port_interface", @@ -2403,14 +2434,17 @@ if (rtc_include_tests && !build_with_chromium) { "../modules/audio_device:audio_device_api", "../modules/audio_processing:audio_processing_statistics", "../modules/rtp_rtcp:rtp_rtcp_format", + "../p2p:basic_port_allocator_and_turn_port", "../p2p:connection", "../p2p:connection_info", + "../p2p:dtls_transport_internal", "../p2p:fake_port_allocator", "../p2p:ice_transport_internal", "../p2p:p2p_constants", "../p2p:p2p_server_utils", "../p2p:port_interface", "../p2p:transport_description", + "../p2p:transport_info", "../rtc_base:byte_buffer", "../rtc_base:checks", "../rtc_base:copy_on_write_buffer", @@ -2619,6 +2653,7 @@ if (rtc_include_tests && !build_with_chromium) { "../modules/audio_processing:audio_processing_statistics", "../modules/audio_processing:audioproc_test_utils", "../modules/rtp_rtcp:rtp_rtcp_format", + "../p2p:basic_port_allocator_and_turn_port", "../p2p:connection", "../p2p:fake_ice_transport", "../p2p:fake_port_allocator", diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index e44681441a..da62266520 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -44,6 +44,7 @@ if (rtc_enable_protobuf) { "../../api/task_queue:default_task_queue_factory", "../../api/task_queue:pending_task_safety_flag", "../../api/units:timestamp", + "../../p2p:basic_packet_socket_factory", "../../p2p:rtc_p2p", "../../rtc_base:async_packet_socket", "../../rtc_base:checks", diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index 4f6a542e54..642b0c8e08 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -476,6 +476,7 @@ webrtc_fuzzer_test("stun_validator_fuzzer") { webrtc_fuzzer_test("pseudotcp_parser_fuzzer") { sources = [ "pseudotcp_parser_fuzzer.cc" ] deps = [ + "../../p2p:pseudo_tcp", "../../p2p:rtc_p2p", "../../rtc_base:threading", ] diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn index 6df563d31d..8f1e0d6f80 100644 --- a/test/network/BUILD.gn +++ b/test/network/BUILD.gn @@ -56,6 +56,7 @@ rtc_library("emulated_network") { "../../api/units:time_delta", "../../api/units:timestamp", "../../call:simulated_network", + "../../p2p:basic_packet_socket_factory", "../../p2p:p2p_server_utils", "../../p2p:rtc_p2p", "../../rtc_base:async_packet_socket", @@ -128,6 +129,8 @@ if (rtc_include_tests && !build_with_chromium) { "../../call:simulated_network", "../../media:rtc_audio_video", "../../modules/audio_device:test_audio_device_module", + "../../p2p:basic_packet_socket_factory", + "../../p2p:basic_port_allocator_and_turn_port", "../../p2p:rtc_p2p", "../../pc:pc_test_utils", "../../pc:peerconnection_wrapper", diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn index e0d3dbe0bc..eca7b1b353 100644 --- a/test/pc/e2e/BUILD.gn +++ b/test/pc/e2e/BUILD.gn @@ -109,6 +109,7 @@ if (!build_with_chromium) { "../../../api/video_codecs:builtin_video_encoder_factory", "../../../modules/audio_device:test_audio_device_module", "../../../modules/audio_processing/aec_dump", + "../../../p2p:basic_port_allocator_and_turn_port", "../../../p2p:rtc_p2p", "../../../rtc_base:threading", "analyzer/video:quality_analyzing_video_encoder", diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn index 4736f675ef..bfd9f4617b 100644 --- a/test/peer_scenario/BUILD.gn +++ b/test/peer_scenario/BUILD.gn @@ -53,6 +53,7 @@ if (rtc_include_tests) { "../../media:rtp_utils", "../../modules/audio_device:test_audio_device_module", "../../modules/rtp_rtcp:rtp_rtcp_format", + "../../p2p:basic_port_allocator_and_turn_port", "../../p2p:rtc_p2p", "../../p2p:transport_description", "../../pc:channel",