diff options
author | Mirko Bonadei <mbonadei@webrtc.org> | 2022-06-20 06:35:28 +0000 |
---|---|---|
committer | WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-06-22 10:44:51 +0000 |
commit | d151cc6fa3130f2ae365417b53a52282b2527b50 (patch) | |
tree | b3b03a4b4de02537690e7e5ff7f848f71a12869f | |
parent | b32ff729c91beb93ed91f6d4fe0ee4f2fd0c75c7 (diff) | |
download | webrtc-d151cc6fa3130f2ae365417b53a52282b2527b50.tar.gz |
Remove the last build cycle in WebRTC
This CL removes the last "nogncheck" comment that was related to a
known build cycle. The remaining ones are because of conditional
dependencies.
Bug: webrtc:8733
Change-Id: Ie6862ae1cc613b9c2740a34c3167e1741ed31ee3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265981
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37302}
-rw-r--r-- | api/BUILD.gn | 40 | ||||
-rw-r--r-- | api/peer_connection_interface.h | 4 | ||||
-rw-r--r-- | logging/BUILD.gn | 2 | ||||
-rw-r--r-- | p2p/BUILD.gn | 10 | ||||
-rw-r--r-- | pc/BUILD.gn | 33 | ||||
-rw-r--r-- | sdk/android/BUILD.gn | 1 | ||||
-rw-r--r-- | test/peer_scenario/BUILD.gn | 1 |
7 files changed, 64 insertions, 27 deletions
diff --git a/api/BUILD.gn b/api/BUILD.gn index cd1c104a76..6ce43218d1 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -134,15 +134,13 @@ rtc_library("media_stream_interface") { ] } -# TODO(bugs.webrtc.org/8733): Switch to rtc_library. rtc_library("candidate") { visibility = [ "*" ] - # TODO(bugs.webrtc.org/8733): Uncomment. - # sources = [ - # "candidate.cc", - # "candidate.h", - # ] + sources = [ + "candidate.cc", + "candidate.h", + ] deps = [ "../rtc_base", "../rtc_base:checks", @@ -158,15 +156,13 @@ rtc_library("candidate") { rtc_source_set("turn_customizer") { visibility = [ "*" ] - # TODO(bugs.webrtc.org/8733): Uncomment. - # sources = [ "turn_customizer.h" ] + sources = [ "turn_customizer.h" ] } rtc_source_set("ice_transport_interface") { visibility = [ "*" ] - # TODO(bugs.webrtc.org/8733): Uncomment. - # sources = [ "ice_transport_interface.h" ] + sources = [ "ice_transport_interface.h" ] deps = [ ":async_dns_resolver", ":packet_socket_factory", @@ -177,15 +173,13 @@ rtc_source_set("ice_transport_interface") { ] } -# TODO(bugs.webrtc.org/8733): Switch to rtc_library. -rtc_source_set("dtls_transport_interface") { +rtc_library("dtls_transport_interface") { visibility = [ "*" ] - # TODO(bugs.webrtc.org/8733): Uncomment. - # sources = [ - # "dtls_transport_interface.cc", - # "dtls_transport_interface.h", - # ] + sources = [ + "dtls_transport_interface.cc", + "dtls_transport_interface.h", + ] deps = [ ":ice_transport_interface", ":rtc_error", @@ -201,15 +195,10 @@ rtc_library("libjingle_peerconnection_api") { visibility = [ "*" ] cflags = [] sources = [ - "candidate.cc", - "candidate.h", "crypto_params.h", "data_channel_interface.cc", "data_channel_interface.h", - "dtls_transport_interface.cc", - "dtls_transport_interface.h", "dtmf_sender_interface.h", - "ice_transport_interface.h", "jsep.cc", "jsep.h", "jsep_ice_candidate.cc", @@ -229,7 +218,6 @@ rtc_library("libjingle_peerconnection_api") { "set_remote_description_observer_interface.h", "stats_types.cc", "stats_types.h", - "turn_customizer.h", "uma_metrics.h", "video_track_source_proxy_factory.h", ] @@ -238,10 +226,13 @@ rtc_library("libjingle_peerconnection_api") { ":async_dns_resolver", ":audio_options_api", ":callfactory_api", + ":candidate", + ":dtls_transport_interface", ":fec_controller_api", ":field_trials", ":field_trials_view", ":frame_transformer_interface", + ":ice_transport_interface", ":libjingle_logging_api", ":make_ref_counted", ":media_stream_interface", @@ -255,7 +246,9 @@ rtc_library("libjingle_peerconnection_api") { ":rtp_transceiver_direction", ":scoped_refptr", ":sequence_checker", + ":turn_customizer", "../call:rtp_interfaces", + "../p2p:rtc_p2p", "../rtc_base:copy_on_write_buffer", "../rtc_base:logging", "../rtc_base:network_constants", @@ -839,6 +832,7 @@ rtc_library("ice_transport_factory") { "ice_transport_factory.h", ] deps = [ + ":ice_transport_interface", ":libjingle_peerconnection_api", ":make_ref_counted", ":packet_socket_factory", diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h index 7e16ad96be..54c4c46feb 100644 --- a/api/peer_connection_interface.h +++ b/api/peer_connection_interface.h @@ -125,8 +125,8 @@ #include "media/base/media_engine.h" // TODO(bugs.webrtc.org/7447): We plan to provide a way to let applications // inject a PacketSocketFactory and/or NetworkManager, and not expose -// PortAllocator in the PeerConnection api. This will let us remove nogncheck. -#include "p2p/base/port_allocator.h" // nogncheck +// PortAllocator in the PeerConnection api. +#include "p2p/base/port_allocator.h" #include "rtc_base/network.h" #include "rtc_base/network_constants.h" #include "rtc_base/network_monitor_factory.h" diff --git a/logging/BUILD.gn b/logging/BUILD.gn index d6b8cab777..25985ebd15 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -568,8 +568,8 @@ rtc_library("ice_log") { deps = [ ":rtc_event_field", + "../api:dtls_transport_interface", "../api:libjingle_logging_api", - "../api:libjingle_peerconnection_api", # For api/dtls_transport_interface.h "../api/rtc_event_log", "../api/units:timestamp", ] diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index 171b1fefa2..0ee345e099 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -88,13 +88,16 @@ rtc_library("rtc_p2p") { deps = [ "../api:array_view", "../api:async_dns_resolver", + "../api:candidate", + "../api:dtls_transport_interface", "../api:field_trials_view", - "../api:libjingle_peerconnection_api", + "../api:ice_transport_interface", "../api:make_ref_counted", "../api:packet_socket_factory", "../api:rtc_error", "../api:scoped_refptr", "../api:sequence_checker", + "../api:turn_customizer", "../api:wrapping_async_dns_resolver", "../api/crypto:options", "../api/rtc_event_log", @@ -161,6 +164,7 @@ if (rtc_include_tests) { sources = [ "base/fake_ice_transport.h" ] deps = [ ":rtc_p2p", + "../api:ice_transport_interface", "../api:libjingle_peerconnection_api", "../api/task_queue:pending_task_safety_flag", "../api/task_queue:to_queued_task", @@ -204,9 +208,11 @@ if (rtc_include_tests) { ":fake_port_allocator", ":p2p_server_utils", ":rtc_p2p", + "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../api:packet_socket_factory", "../api:sequence_checker", + "../api:turn_customizer", "../api/crypto:options", "../api/transport:stun_types", "../rtc_base", @@ -256,6 +262,8 @@ if (rtc_include_tests) { ":p2p_server_utils", ":p2p_test_utils", ":rtc_p2p", + "../api:candidate", + "../api:dtls_transport_interface", "../api:field_trials_view", "../api:libjingle_peerconnection_api", "../api:mock_async_dns_resolver", diff --git a/pc/BUILD.gn b/pc/BUILD.gn index b5f22ac65a..289e6e200e 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -125,6 +125,7 @@ rtc_source_set("dtls_srtp_transport") { ] deps = [ ":srtp_transport", + "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../api:rtc_error", "../p2p:rtc_p2p", @@ -145,6 +146,8 @@ rtc_source_set("dtls_transport") { ] deps = [ ":ice_transport", + "../api:dtls_transport_interface", + "../api:ice_transport_interface", "../api:libjingle_peerconnection_api", "../api:make_ref_counted", "../api:scoped_refptr", @@ -182,6 +185,7 @@ rtc_source_set("ice_transport") { "ice_transport.h", ] deps = [ + "../api:ice_transport_interface", "../api:libjingle_peerconnection_api", "../api:sequence_checker", "../rtc_base:checks", @@ -209,6 +213,8 @@ rtc_source_set("jsep_transport") { ":srtp_transport", ":transport_stats", "../api:array_view", + "../api:candidate", + "../api:ice_transport_interface", "../api:libjingle_peerconnection_api", "../api:rtc_error", "../api:scoped_refptr", @@ -270,7 +276,10 @@ rtc_source_set("jsep_transport_controller") { ":srtp_transport", ":transport_stats", "../api:async_dns_resolver", + "../api:candidate", + "../api:dtls_transport_interface", "../api:ice_transport_factory", + "../api:ice_transport_interface", "../api:libjingle_peerconnection_api", "../api:rtc_error", "../api:rtp_parameters", @@ -484,6 +493,7 @@ rtc_source_set("sctp_transport") { ] deps = [ ":dtls_transport", + "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../api:scoped_refptr", "../api:sequence_checker", @@ -613,6 +623,7 @@ rtc_source_set("transport_stats") { "transport_stats.h", ] deps = [ + "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../p2p:rtc_p2p", "../rtc_base", @@ -1011,6 +1022,8 @@ rtc_source_set("rtc_stats_collector") { ":transport_stats", ":webrtc_sdp", "../api:array_view", + "../api:candidate", + "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", "../api:rtc_stats_api", @@ -1096,6 +1109,8 @@ rtc_source_set("sdp_offer_answer") { ":webrtc_session_description_factory", "../api:array_view", "../api:audio_options_api", + "../api:candidate", + "../api:dtls_transport_interface", "../api:field_trials_view", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", @@ -1183,7 +1198,10 @@ rtc_source_set("peer_connection") { ":usage_pattern", ":webrtc_session_description_factory", "../api:async_dns_resolver", + "../api:candidate", + "../api:dtls_transport_interface", "../api:field_trials_view", + "../api:ice_transport_interface", "../api:libjingle_logging_api", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", @@ -1193,6 +1211,7 @@ rtc_source_set("peer_connection") { "../api:rtp_transceiver_direction", "../api:scoped_refptr", "../api:sequence_checker", + "../api:turn_customizer", "../api/adaptation:resource_adaptation_api", "../api/crypto:options", "../api/rtc_event_log", @@ -1281,6 +1300,7 @@ rtc_source_set("stats_collector") { ":rtp_transceiver", ":stats_collector_interface", ":transport_stats", + "../api:candidate", "../api:field_trials_view", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", @@ -1351,6 +1371,7 @@ rtc_source_set("webrtc_sdp") { ":sdp_serializer", ":session_description", ":simulcast_description", + "../api:candidate", "../api:libjingle_peerconnection_api", "../api:rtc_error", "../api:rtp_parameters", @@ -1455,6 +1476,7 @@ rtc_source_set("peer_connection_factory") { "../api:callfactory_api", "../api:fec_controller_api", "../api:field_trials_view", + "../api:ice_transport_interface", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", "../api:network_state_predictor_api", @@ -1647,6 +1669,7 @@ rtc_library("rtp_receiver") { ":media_stream", ":media_stream_proxy", ":video_track_source", + "../api:dtls_transport_interface", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", "../api:rtp_parameters", @@ -1679,6 +1702,7 @@ rtc_library("audio_rtp_receiver") { ":media_stream_track_proxy", ":remote_audio_source", ":rtp_receiver", + "../api:dtls_transport_interface", "../api:frame_transformer_interface", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", @@ -1717,6 +1741,7 @@ rtc_library("video_rtp_receiver") { ":rtp_receiver", ":video_rtp_track_source", ":video_track", + "../api:dtls_transport_interface", "../api:frame_transformer_interface", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", @@ -1863,6 +1888,7 @@ rtc_library("rtp_sender") { ":dtmf_sender", ":stats_collector_interface", "../api:audio_options_api", + "../api:dtls_transport_interface", "../api:frame_transformer_interface", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", @@ -2061,6 +2087,8 @@ if (rtc_include_tests && !build_with_chromium) { ":video_rtp_receiver", "../api:array_view", "../api:audio_options_api", + "../api:candidate", + "../api:dtls_transport_interface", "../api:ice_transport_factory", "../api:libjingle_peerconnection_api", "../api:make_ref_counted", @@ -2317,11 +2345,14 @@ if (rtc_include_tests && !build_with_chromium) { ":webrtc_sdp", "../api:array_view", "../api:audio_options_api", + "../api:candidate", "../api:create_peerconnection_factory", + "../api:dtls_transport_interface", "../api:fake_frame_decryptor", "../api:fake_frame_encryptor", "../api:field_trials_view", "../api:function_view", + "../api:ice_transport_interface", "../api:libjingle_logging_api", "../api:libjingle_peerconnection_api", "../api:make_ref_counted", @@ -2512,11 +2543,13 @@ if (rtc_include_tests && !build_with_chromium) { "../api:array_view", "../api:audio_options_api", "../api:callfactory_api", + "../api:candidate", "../api:create_peerconnection_factory", "../api:fake_frame_decryptor", "../api:fake_frame_encryptor", "../api:field_trials_view", "../api:function_view", + "../api:ice_transport_interface", "../api:libjingle_logging_api", "../api:libjingle_peerconnection_api", "../api:media_stream_interface", diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 812984a40a..8bed067379 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -785,6 +785,7 @@ if (current_os == "linux" || is_android) { "../../api:media_stream_interface", "../../api:rtc_event_log_output_file", "../../api:rtp_parameters", + "../../api:turn_customizer", "../../api/crypto:options", "../../api/rtc_event_log:rtc_event_log_factory", "../../api/task_queue:default_task_queue_factory", diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn index bea18bf65f..9410a0b6a3 100644 --- a/test/peer_scenario/BUILD.gn +++ b/test/peer_scenario/BUILD.gn @@ -26,6 +26,7 @@ if (rtc_include_tests) { "..:fileutils", "..:test_support", "../:video_test_common", + "../../api:candidate", "../../api:create_time_controller", "../../api:libjingle_peerconnection_api", "../../api:network_emulation_manager_api", |