diff options
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0030.patch')
| -rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0030.patch | 188 |
1 files changed, 102 insertions, 86 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0030.patch b/third_party/libwebrtc/moz-patch-stack/0030.patch index c5c638459c..8c6652af46 100644 --- a/third_party/libwebrtc/moz-patch-stack/0030.patch +++ b/third_party/libwebrtc/moz-patch-stack/0030.patch @@ -55,13 +55,21 @@ Bug 1774628 - re-enable support for Windows.Graphics.Capture APIs in libwebrtc. Differential Revision: https://phabricator.services.mozilla.com/D186862 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/08567f4539a12b54202aecbf554ec6540fb99ab2 + +Bug 1876843 - (fix-082cb56ee7) remove mozilla dependency on pc:media_factory. + +Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/136b3fc0377be6dcaa302469d27968f445e0355e + +Bug 1876843 - (fix-b29ff000da) remove mozilla dependency on api:enable_media + +Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/7f403ee038e9797a1aff6161fc70a2d92769851f --- .gn | 2 + - BUILD.gn | 45 ++++++++++++++++++- - api/BUILD.gn | 34 +++++++++++++- + BUILD.gn | 46 ++++++++++++++++++- + api/BUILD.gn | 36 ++++++++++++++- api/rtp_sender_interface.h | 4 +- api/rtp_sender_setparameters_callback.cc | 27 +++++++++++ - api/rtp_sender_setparameters_callback.h | 28 ++++++++++++ + api/rtp_sender_setparameters_callback.h | 28 +++++++++++ api/task_queue/BUILD.gn | 2 + api/transport/BUILD.gn | 2 + call/BUILD.gn | 14 +++++- @@ -70,24 +78,24 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/08567f4539a12b542 common_audio/BUILD.gn | 4 -- common_audio/fir_filter_avx2.cc | 2 + common_audio/intrin.h | 8 ++++ - media/BUILD.gn | 35 ++++++++++++++- + media/BUILD.gn | 35 +++++++++++++- media/base/media_channel.h | 4 -- media/base/media_channel_impl.cc | 13 ------ modules/audio_coding/BUILD.gn | 2 +- modules/audio_device/BUILD.gn | 17 +++++-- - modules/audio_processing/aec3/BUILD.gn | 13 +++--- + modules/audio_processing/aec3/BUILD.gn | 13 ++---- .../aec3/adaptive_fir_filter_avx2.cc | 2 +- .../audio_processing/agc2/rnn_vad/BUILD.gn | 2 +- modules/desktop_capture/BUILD.gn | 29 +----------- modules/portal/BUILD.gn | 24 ++++++++++ modules/utility/BUILD.gn | 4 ++ modules/video_capture/BUILD.gn | 11 +---- - rtc_base/BUILD.gn | 30 ++++++++++++- + rtc_base/BUILD.gn | 30 +++++++++++- rtc_base/system/BUILD.gn | 2 +- - test/BUILD.gn | 10 +++++ + test/BUILD.gn | 10 ++++ video/BUILD.gn | 4 +- webrtc.gni | 32 ++++++++----- - 31 files changed, 311 insertions(+), 99 deletions(-) + 31 files changed, 315 insertions(+), 98 deletions(-) create mode 100644 api/rtp_sender_setparameters_callback.cc create mode 100644 api/rtp_sender_setparameters_callback.h create mode 100644 common_audio/intrin.h @@ -106,7 +114,7 @@ index b9948d2fcd..77cfa94d8a 100644 # TODO(https://bugs.webrtc.org/14437): Remove this section if general # Chromium fix resolves the problem. diff --git a/BUILD.gn b/BUILD.gn -index 7e8325e306..f61f8965b9 100644 +index 571049f3e4..f393179bbb 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -33,7 +33,7 @@ if (is_android) { @@ -141,13 +149,14 @@ index 7e8325e306..f61f8965b9 100644 if (!build_with_chromium) { # Target to build all the WebRTC production code. -@@ -532,6 +538,33 @@ if (!build_with_chromium) { +@@ -533,6 +539,34 @@ if (!build_with_chromium) { "sdk", "video", ] + if (build_with_mozilla) { + deps -= [ + "api:create_peerconnection_factory", ++ "api:enable_media", + "api:rtc_error", + "api:transport_api", + "api/crypto", @@ -175,7 +184,7 @@ index 7e8325e306..f61f8965b9 100644 if (rtc_include_builtin_audio_codecs) { deps += [ -@@ -544,6 +577,16 @@ if (!build_with_chromium) { +@@ -545,6 +579,16 @@ if (!build_with_chromium) { deps += [ "api/video:video_frame", "api/video:video_rtp_headers", @@ -193,10 +202,20 @@ index 7e8325e306..f61f8965b9 100644 } else { deps += [ diff --git a/api/BUILD.gn b/api/BUILD.gn -index 46703f93ce..d2b7f06c87 100644 +index ee162577c8..10a4c8c95f 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn -@@ -35,7 +35,7 @@ rtc_source_set("callfactory_api") { +@@ -49,6 +49,9 @@ rtc_source_set("enable_media") { + "../rtc_base/system:rtc_export", + "environment", + ] ++ if (build_with_mozilla) { ++ deps -= [ "../pc:media_factory" ] ++ } + } + + rtc_source_set("enable_media_with_defaults") { +@@ -75,7 +78,7 @@ rtc_source_set("enable_media_with_defaults") { ] } @@ -204,8 +223,8 @@ index 46703f93ce..d2b7f06c87 100644 +if (!build_with_chromium && !build_with_mozilla) { rtc_library("create_peerconnection_factory") { visibility = [ "*" ] - allow_poison = [ "default_task_queue" ] -@@ -189,6 +189,10 @@ rtc_source_set("ice_transport_interface") { + allow_poison = [ "environment_construction" ] +@@ -228,6 +231,10 @@ rtc_source_set("ice_transport_interface") { } rtc_library("dtls_transport_interface") { @@ -216,7 +235,7 @@ index 46703f93ce..d2b7f06c87 100644 visibility = [ "*" ] sources = [ -@@ -205,6 +209,7 @@ rtc_library("dtls_transport_interface") { +@@ -244,6 +251,7 @@ rtc_library("dtls_transport_interface") { ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -224,7 +243,7 @@ index 46703f93ce..d2b7f06c87 100644 rtc_library("dtmf_sender_interface") { visibility = [ "*" ] -@@ -217,6 +222,10 @@ rtc_library("dtmf_sender_interface") { +@@ -256,6 +264,10 @@ rtc_library("dtmf_sender_interface") { } rtc_library("rtp_sender_interface") { @@ -235,17 +254,14 @@ index 46703f93ce..d2b7f06c87 100644 visibility = [ "*" ] sources = [ -@@ -228,8 +237,8 @@ rtc_library("rtp_sender_interface") { - ":dtmf_sender_interface", - ":frame_transformer_interface", - ":media_stream_interface", -- ":rtc_error", +@@ -270,16 +282,31 @@ rtc_library("rtp_sender_interface") { + ":ref_count", + ":rtc_error", ":rtp_parameters", + ":rtp_sender_setparameters_callback", ":scoped_refptr", "../rtc_base:checks", - "../rtc_base:refcount", -@@ -237,10 +246,24 @@ rtc_library("rtp_sender_interface") { + "../rtc_base/system:rtc_export", "crypto:frame_encryptor_interface", "video_codecs:video_codecs_api", ] @@ -270,7 +286,7 @@ index 46703f93ce..d2b7f06c87 100644 visibility = [ "*" ] cflags = [] sources = [ -@@ -357,6 +380,7 @@ rtc_library("libjingle_peerconnection_api") { +@@ -396,6 +423,7 @@ rtc_library("libjingle_peerconnection_api") { "//third_party/abseil-cpp/absl/types:optional", ] } @@ -278,7 +294,7 @@ index 46703f93ce..d2b7f06c87 100644 rtc_source_set("frame_transformer_interface") { visibility = [ "*" ] -@@ -548,6 +572,7 @@ rtc_source_set("peer_network_dependencies") { +@@ -568,6 +596,7 @@ rtc_source_set("peer_network_dependencies") { } rtc_source_set("peer_connection_quality_test_fixture_api") { @@ -286,7 +302,7 @@ index 46703f93ce..d2b7f06c87 100644 visibility = [ "*" ] testonly = true sources = [ "test/peerconnection_quality_test_fixture.h" ] -@@ -598,6 +623,7 @@ rtc_source_set("peer_connection_quality_test_fixture_api") { +@@ -618,6 +647,7 @@ rtc_source_set("peer_connection_quality_test_fixture_api") { "//third_party/abseil-cpp/absl/types:optional", ] } @@ -294,7 +310,7 @@ index 46703f93ce..d2b7f06c87 100644 rtc_source_set("frame_generator_api") { visibility = [ "*" ] -@@ -716,6 +742,7 @@ rtc_library("create_frame_generator") { +@@ -736,6 +766,7 @@ rtc_library("create_frame_generator") { absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -302,7 +318,7 @@ index 46703f93ce..d2b7f06c87 100644 rtc_library("create_peer_connection_quality_test_frame_generator") { visibility = [ "*" ] testonly = true -@@ -732,6 +759,7 @@ rtc_library("create_peer_connection_quality_test_frame_generator") { +@@ -752,6 +783,7 @@ rtc_library("create_peer_connection_quality_test_frame_generator") { ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -310,7 +326,7 @@ index 46703f93ce..d2b7f06c87 100644 rtc_source_set("libjingle_logging_api") { visibility = [ "*" ] -@@ -904,6 +932,7 @@ rtc_source_set("refcountedbase") { +@@ -926,6 +958,7 @@ rtc_source_set("refcountedbase") { ] } @@ -318,7 +334,7 @@ index 46703f93ce..d2b7f06c87 100644 rtc_library("ice_transport_factory") { visibility = [ "*" ] sources = [ -@@ -922,6 +951,7 @@ rtc_library("ice_transport_factory") { +@@ -944,6 +977,7 @@ rtc_library("ice_transport_factory") { "rtc_event_log:rtc_event_log", ] } @@ -327,11 +343,11 @@ index 46703f93ce..d2b7f06c87 100644 rtc_library("neteq_simulator_api") { visibility = [ "*" ] diff --git a/api/rtp_sender_interface.h b/api/rtp_sender_interface.h -index 41d35bc287..619b601f1f 100644 +index 7b8ab135c8..7090c233cd 100644 --- a/api/rtp_sender_interface.h +++ b/api/rtp_sender_interface.h @@ -32,9 +32,9 @@ - #include "rtc_base/ref_count.h" + #include "api/video_codecs/video_encoder_factory.h" #include "rtc_base/system/rtc_export.h" -namespace webrtc { @@ -340,7 +356,7 @@ index 41d35bc287..619b601f1f 100644 -using SetParametersCallback = absl::AnyInvocable<void(RTCError) &&>; +namespace webrtc { - class RTC_EXPORT RtpSenderInterface : public rtc::RefCountInterface { + class RTC_EXPORT RtpSenderInterface : public webrtc::RefCountInterface { public: diff --git a/api/rtp_sender_setparameters_callback.cc b/api/rtp_sender_setparameters_callback.cc new file mode 100644 @@ -410,7 +426,7 @@ index 0000000000..45194f5ace + +#endif // API_RTP_SENDER_SETPARAMETERS_CALLBACK_H_ diff --git a/api/task_queue/BUILD.gn b/api/task_queue/BUILD.gn -index e0e2e50514..8d845e2735 100644 +index 246164c68b..d557d8f100 100644 --- a/api/task_queue/BUILD.gn +++ b/api/task_queue/BUILD.gn @@ -31,6 +31,7 @@ rtc_library("task_queue") { @@ -450,7 +466,7 @@ index 84a0968ee9..c0209bf0d0 100644 if (rtc_include_tests) { rtc_source_set("test_feedback_generator_interface") { diff --git a/call/BUILD.gn b/call/BUILD.gn -index 58473dc1ea..825097e8d4 100644 +index 66c8b2011a..fa733a67b9 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -46,7 +46,7 @@ rtc_library("call_interfaces") { @@ -462,7 +478,7 @@ index 58473dc1ea..825097e8d4 100644 "../api:scoped_refptr", "../api:transport_api", "../api/adaptation:resource_adaptation_api", -@@ -346,6 +346,16 @@ rtc_library("call") { +@@ -347,6 +347,16 @@ rtc_library("call") { "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/types:optional", ] @@ -479,7 +495,7 @@ index 58473dc1ea..825097e8d4 100644 } rtc_source_set("receive_stream_interface") { -@@ -373,7 +383,7 @@ rtc_library("video_stream_api") { +@@ -374,7 +384,7 @@ rtc_library("video_stream_api") { "../api:frame_transformer_interface", "../api:rtp_headers", "../api:rtp_parameters", @@ -502,7 +518,7 @@ index 9c2fad652f..f9e49db574 100644 #include "call/audio_sender.h" #include "call/rtp_config.h" diff --git a/call/video_send_stream.h b/call/video_send_stream.h -index 5fde44a719..1a0261be1b 100644 +index c305d60bcc..2b4ea5b66a 100644 --- a/call/video_send_stream.h +++ b/call/video_send_stream.h @@ -23,7 +23,7 @@ @@ -561,7 +577,7 @@ index 0000000000..f6ff7f218f + #endif +#endif diff --git a/media/BUILD.gn b/media/BUILD.gn -index cf7c523201..97ad4a889a 100644 +index 295a748802..055bf75a19 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -64,7 +64,7 @@ rtc_library("rtc_media_base") { @@ -601,7 +617,7 @@ index cf7c523201..97ad4a889a 100644 rtc_source_set("media_channel") { sources = [ "base/media_channel.h" ] -@@ -269,6 +280,7 @@ rtc_library("codec") { +@@ -268,6 +279,7 @@ rtc_library("codec") { } rtc_library("rtp_utils") { @@ -609,7 +625,7 @@ index cf7c523201..97ad4a889a 100644 sources = [ "base/rtp_utils.cc", "base/rtp_utils.h", -@@ -285,8 +297,10 @@ rtc_library("rtp_utils") { +@@ -284,8 +296,10 @@ rtc_library("rtp_utils") { ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -620,7 +636,7 @@ index cf7c523201..97ad4a889a 100644 sources = [ "base/stream_params.cc", "base/stream_params.h", -@@ -299,6 +313,7 @@ rtc_library("stream_params") { +@@ -298,6 +312,7 @@ rtc_library("stream_params") { ] absl_deps = [ "//third_party/abseil-cpp/absl/algorithm:container" ] } @@ -628,7 +644,7 @@ index cf7c523201..97ad4a889a 100644 rtc_library("media_constants") { sources = [ -@@ -309,6 +324,7 @@ rtc_library("media_constants") { +@@ -308,6 +323,7 @@ rtc_library("media_constants") { } rtc_library("turn_utils") { @@ -636,7 +652,7 @@ index cf7c523201..97ad4a889a 100644 sources = [ "base/turn_utils.cc", "base/turn_utils.h", -@@ -319,14 +335,17 @@ rtc_library("turn_utils") { +@@ -318,14 +334,17 @@ rtc_library("turn_utils") { "../rtc_base/system:rtc_export", ] } @@ -654,7 +670,7 @@ index cf7c523201..97ad4a889a 100644 rtc_library("rtc_simulcast_encoder_adapter") { visibility = [ "*" ] -@@ -400,6 +419,12 @@ rtc_library("rtc_internal_video_codecs") { +@@ -399,6 +418,12 @@ rtc_library("rtc_internal_video_codecs") { "../system_wrappers:field_trial", "../test:fake_video_codecs", ] @@ -667,7 +683,7 @@ index cf7c523201..97ad4a889a 100644 if (enable_libaom) { defines += [ "RTC_USE_LIBAOM_AV1_ENCODER" ] -@@ -425,6 +450,14 @@ rtc_library("rtc_internal_video_codecs") { +@@ -424,6 +449,14 @@ rtc_library("rtc_internal_video_codecs") { "engine/multiplex_codec_factory.cc", "engine/multiplex_codec_factory.h", ] @@ -722,7 +738,7 @@ index e7e84c781c..5b41a9ccda 100644 using webrtc::FrameDecryptorInterface; using webrtc::FrameEncryptorInterface; diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn -index 61fecea691..3e4d7e0c25 100644 +index 5de99efa45..ddd1fd2656 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -553,7 +553,7 @@ rtc_library("webrtc_opus_wrapper") { @@ -735,7 +751,7 @@ index 61fecea691..3e4d7e0c25 100644 } diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn -index f1ab09d154..4726f93279 100644 +index 6f52cf8af1..a135f042db 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -30,6 +30,7 @@ rtc_source_set("audio_device_default") { @@ -754,7 +770,7 @@ index f1ab09d154..4726f93279 100644 rtc_source_set("audio_device_api") { visibility = [ "*" ] -@@ -62,6 +64,7 @@ rtc_library("audio_device_config") { +@@ -63,6 +65,7 @@ rtc_library("audio_device_config") { } rtc_library("audio_device_buffer") { @@ -762,7 +778,7 @@ index f1ab09d154..4726f93279 100644 sources = [ "audio_device_buffer.cc", "audio_device_buffer.h", -@@ -88,6 +91,7 @@ rtc_library("audio_device_buffer") { +@@ -89,6 +92,7 @@ rtc_library("audio_device_buffer") { "../../system_wrappers:metrics", ] } @@ -770,7 +786,7 @@ index f1ab09d154..4726f93279 100644 rtc_library("audio_device_generic") { sources = [ -@@ -265,6 +269,7 @@ if (!build_with_chromium) { +@@ -266,6 +270,7 @@ if (!build_with_chromium) { # Contains default implementations of webrtc::AudioDeviceModule for Windows, # Linux, Mac, iOS and Android. rtc_library("audio_device_impl") { @@ -778,7 +794,7 @@ index f1ab09d154..4726f93279 100644 visibility = [ "*" ] deps = [ ":audio_device_api", -@@ -314,9 +319,9 @@ rtc_library("audio_device_impl") { +@@ -315,9 +320,9 @@ rtc_library("audio_device_impl") { sources = [ "include/fake_audio_device.h" ] if (build_with_mozilla) { @@ -791,7 +807,7 @@ index f1ab09d154..4726f93279 100644 ] } -@@ -421,6 +426,7 @@ rtc_library("audio_device_impl") { +@@ -422,6 +427,7 @@ rtc_library("audio_device_impl") { sources += [ "dummy/file_audio_device_factory.h" ] } } @@ -799,7 +815,7 @@ index f1ab09d154..4726f93279 100644 if (is_mac) { rtc_source_set("audio_device_impl_frameworks") { -@@ -438,6 +444,7 @@ if (is_mac) { +@@ -439,6 +445,7 @@ if (is_mac) { } } @@ -807,7 +823,7 @@ index f1ab09d154..4726f93279 100644 rtc_source_set("mock_audio_device") { visibility = [ "*" ] testonly = true -@@ -454,8 +461,10 @@ rtc_source_set("mock_audio_device") { +@@ -455,8 +462,10 @@ rtc_source_set("mock_audio_device") { "../../test:test_support", ] } @@ -1012,10 +1028,10 @@ index 730ec9bfdd..d473dbb74c 100644 "/config/external/nspr", "/nsprpub/lib/ds", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index 99d8e48e39..b411811b70 100644 +index 9f5f0aad56..089b9971a3 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn -@@ -323,6 +323,7 @@ rtc_library("sample_counter") { +@@ -327,6 +327,7 @@ rtc_library("sample_counter") { absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -1023,7 +1039,7 @@ index 99d8e48e39..b411811b70 100644 rtc_library("timestamp_aligner") { visibility = [ "*" ] sources = [ -@@ -336,6 +337,7 @@ rtc_library("timestamp_aligner") { +@@ -340,6 +341,7 @@ rtc_library("timestamp_aligner") { "system:rtc_export", ] } @@ -1031,7 +1047,7 @@ index 99d8e48e39..b411811b70 100644 rtc_library("zero_memory") { visibility = [ "*" ] -@@ -869,7 +871,9 @@ rtc_library("rtc_json") { +@@ -875,7 +877,9 @@ rtc_library("rtc_json") { "strings/json.h", ] deps = [ ":stringutils" ] @@ -1041,7 +1057,7 @@ index 99d8e48e39..b411811b70 100644 if (rtc_build_json) { deps += [ "//third_party/jsoncpp" ] } else { -@@ -1234,6 +1238,7 @@ if (!build_with_chromium) { +@@ -1223,6 +1227,7 @@ if (!build_with_chromium) { } rtc_library("network") { @@ -1049,7 +1065,7 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "network.cc", -@@ -1272,16 +1277,20 @@ rtc_library("network") { +@@ -1261,16 +1266,20 @@ rtc_library("network") { deps += [ ":win32" ] } } @@ -1070,7 +1086,7 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "net_helper.cc", -@@ -1290,8 +1299,10 @@ rtc_library("net_helper") { +@@ -1279,8 +1288,10 @@ rtc_library("net_helper") { absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] deps = [ "system:rtc_export" ] } @@ -1081,7 +1097,7 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "socket_adapters.cc", -@@ -1311,6 +1322,7 @@ rtc_library("socket_adapters") { +@@ -1300,6 +1311,7 @@ rtc_library("socket_adapters") { ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -1089,7 +1105,7 @@ index 99d8e48e39..b411811b70 100644 rtc_library("network_route") { sources = [ -@@ -1325,6 +1337,7 @@ rtc_library("network_route") { +@@ -1314,6 +1326,7 @@ rtc_library("network_route") { } rtc_library("async_tcp_socket") { @@ -1097,7 +1113,7 @@ index 99d8e48e39..b411811b70 100644 sources = [ "async_tcp_socket.cc", "async_tcp_socket.h", -@@ -1342,8 +1355,10 @@ rtc_library("async_tcp_socket") { +@@ -1331,8 +1344,10 @@ rtc_library("async_tcp_socket") { "network:sent_packet", ] } @@ -1108,7 +1124,7 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "async_udp_socket.cc", -@@ -1365,8 +1380,10 @@ rtc_library("async_udp_socket") { +@@ -1354,8 +1369,10 @@ rtc_library("async_udp_socket") { ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -1119,15 +1135,15 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "async_packet_socket.cc", -@@ -1384,6 +1401,7 @@ rtc_library("async_packet_socket") { +@@ -1375,6 +1392,7 @@ rtc_library("async_packet_socket") { "third_party/sigslot", ] } +} - rtc_library("mdns_responder_interface") { - sources = [ "mdns_responder_interface.h" ] -@@ -1396,6 +1414,7 @@ rtc_library("dscp") { + if (rtc_include_tests) { + rtc_library("async_packet_socket_unittest") { +@@ -1402,6 +1420,7 @@ rtc_library("dscp") { } rtc_library("proxy_info") { @@ -1135,7 +1151,7 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "proxy_info.cc", -@@ -1406,6 +1425,7 @@ rtc_library("proxy_info") { +@@ -1412,6 +1431,7 @@ rtc_library("proxy_info") { ":socket_address", ] } @@ -1143,7 +1159,7 @@ index 99d8e48e39..b411811b70 100644 rtc_library("file_rotating_stream") { sources = [ -@@ -1434,6 +1454,7 @@ rtc_library("data_rate_limiter") { +@@ -1440,6 +1460,7 @@ rtc_library("data_rate_limiter") { } rtc_library("unique_id_generator") { @@ -1151,7 +1167,7 @@ index 99d8e48e39..b411811b70 100644 sources = [ "unique_id_generator.cc", "unique_id_generator.h", -@@ -1448,6 +1469,7 @@ rtc_library("unique_id_generator") { +@@ -1454,6 +1475,7 @@ rtc_library("unique_id_generator") { ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -1159,7 +1175,7 @@ index 99d8e48e39..b411811b70 100644 rtc_library("crc32") { sources = [ -@@ -1475,6 +1497,7 @@ rtc_library("stream") { +@@ -1481,6 +1503,7 @@ rtc_library("stream") { } rtc_library("rtc_certificate_generator") { @@ -1167,7 +1183,7 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "rtc_certificate_generator.cc", -@@ -1492,8 +1515,10 @@ rtc_library("rtc_certificate_generator") { +@@ -1498,8 +1521,10 @@ rtc_library("rtc_certificate_generator") { "//third_party/abseil-cpp/absl/types:optional", ] } @@ -1178,7 +1194,7 @@ index 99d8e48e39..b411811b70 100644 visibility = [ "*" ] sources = [ "helpers.cc", -@@ -1594,6 +1619,7 @@ rtc_library("ssl") { +@@ -1600,6 +1625,7 @@ rtc_library("ssl") { deps += [ ":win32" ] } } @@ -1186,7 +1202,7 @@ index 99d8e48e39..b411811b70 100644 rtc_library("crypt_string") { sources = [ -@@ -1603,6 +1629,7 @@ rtc_library("crypt_string") { +@@ -1609,6 +1635,7 @@ rtc_library("crypt_string") { } rtc_library("http_common") { @@ -1194,7 +1210,7 @@ index 99d8e48e39..b411811b70 100644 sources = [ "http_common.cc", "http_common.h", -@@ -1619,6 +1646,7 @@ rtc_library("http_common") { +@@ -1625,6 +1652,7 @@ rtc_library("http_common") { absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -1202,7 +1218,7 @@ index 99d8e48e39..b411811b70 100644 rtc_source_set("gtest_prod") { sources = [ "gtest_prod_util.h" ] -@@ -2176,7 +2204,7 @@ if (rtc_include_tests) { +@@ -2189,7 +2217,7 @@ if (rtc_include_tests) { } } @@ -1225,7 +1241,7 @@ index 77f5139a2f..486b37590c 100644 deps += [ "..:logging", diff --git a/test/BUILD.gn b/test/BUILD.gn -index be8ee1684e..f7980f941d 100644 +index d313c6d82d..854530c01e 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -241,6 +241,7 @@ rtc_library("audio_test_common") { @@ -1267,7 +1283,7 @@ index be8ee1684e..f7980f941d 100644 sources += [ "testsupport/jpeg_frame_writer.cc" ] } else { sources += [ "testsupport/jpeg_frame_writer_ios.cc" ] -@@ -1322,6 +1330,7 @@ if (!build_with_chromium) { +@@ -1331,6 +1339,7 @@ if (!build_with_chromium) { } } @@ -1275,7 +1291,7 @@ index be8ee1684e..f7980f941d 100644 if (!build_with_chromium && is_android) { rtc_android_library("native_test_java") { testonly = true -@@ -1335,6 +1344,7 @@ if (!build_with_chromium && is_android) { +@@ -1344,6 +1353,7 @@ if (!build_with_chromium && is_android) { ] } } @@ -1284,7 +1300,7 @@ index be8ee1684e..f7980f941d 100644 rtc_library("call_config_utils") { testonly = true diff --git a/video/BUILD.gn b/video/BUILD.gn -index 1722ad4f6e..e84b73a352 100644 +index 204c6b66f4..0a930053c0 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -17,7 +17,7 @@ rtc_library("video_stream_encoder_interface") { @@ -1306,7 +1322,7 @@ index 1722ad4f6e..e84b73a352 100644 "../api/adaptation:resource_adaptation_api", "../api/task_queue:pending_task_safety_flag", diff --git a/webrtc.gni b/webrtc.gni -index 912b9b4ef0..1ee647b69d 100644 +index 277c12c054..c84464e84a 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -35,6 +35,11 @@ if (is_mac) { @@ -1406,7 +1422,7 @@ index 912b9b4ef0..1ee647b69d 100644 # Make it possible to provide custom locations for some libraries (move these # up into declare_args should we need to actually use them for the GN build). rtc_libvpx_dir = "//third_party/libvpx" -@@ -1144,7 +1154,7 @@ if (is_mac || is_ios) { +@@ -1146,7 +1156,7 @@ if (is_mac || is_ios) { } } |