From 6be15e5e2e1635a9fceacb6d81a5290f3086cb15 Mon Sep 17 00:00:00 2001 From: Andreas Pehrson Date: Mon, 16 Oct 2023 17:35:11 +0200 Subject: [PATCH] Bug 1857862 - Vendor libwebrtc from 23fc2bee6b Upstream commit: https://webrtc.googlesource.com/src/+/23fc2bee6ba50873bbdbea71cc6b8d719e30507b Remove backwards compatibity #include Bug: b/292167110 Change-Id: I3d9766ac095256a069c9bae34d6d3402819d0e15 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/314680 Reviewed-by: Harald Alvestrand Commit-Queue: Mirko Bonadei Auto-Submit: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#40501} --- third_party/libwebrtc/README.moz-ff-commit | 3 ++ third_party/libwebrtc/README.mozilla | 2 + .../libwebrtc/moz-patch-stack/0002.patch | 2 +- .../libwebrtc/moz-patch-stack/0031.patch | 38 +++++++++---------- .../libwebrtc/moz-patch-stack/0065.patch | 2 +- third_party/libwebrtc/rtc_base/BUILD.gn | 5 +-- third_party/libwebrtc/rtc_base/net_helpers.h | 2 - 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index b37b47ece8ba..3790fb2f3524 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -25203,3 +25203,6 @@ fe2e7eaa20 # MOZ_LIBWEBRTC_SRC=/home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh # base of lastest vendoring 86a7969a6d +# MOZ_LIBWEBRTC_SRC=/home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh +# base of lastest vendoring +23fc2bee6b diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index a6fc5c3e15e5..b1561e440c98 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -16826,3 +16826,5 @@ libwebrtc updated from /home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc co libwebrtc updated from /home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-10-16T15:32:16.512800. # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc libwebrtc updated from /home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-10-16T15:33:39.317533. +# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc +libwebrtc updated from /home/pehrsons/dev/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-10-16T15:35:00.137562. diff --git a/third_party/libwebrtc/moz-patch-stack/0002.patch b/third_party/libwebrtc/moz-patch-stack/0002.patch index 857ba7946c73..713efd2d0ac5 100644 --- a/third_party/libwebrtc/moz-patch-stack/0002.patch +++ b/third_party/libwebrtc/moz-patch-stack/0002.patch @@ -1562,7 +1562,7 @@ index 0474e7bc17..1953923f81 100644 std::unique_ptr svc_controller_; absl::optional scalability_mode_; diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index ceb16a77b5..e058d007ed 100644 +index f3810fdd36..b8113bd4bc 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -458,6 +458,12 @@ rtc_library("logging") { diff --git a/third_party/libwebrtc/moz-patch-stack/0031.patch b/third_party/libwebrtc/moz-patch-stack/0031.patch index de8dc54ad7ea..7eb6d77a2369 100644 --- a/third_party/libwebrtc/moz-patch-stack/0031.patch +++ b/third_party/libwebrtc/moz-patch-stack/0031.patch @@ -1012,7 +1012,7 @@ index 730ec9bfdd..d473dbb74c 100644 "/config/external/nspr", "/nsprpub/lib/ds", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index e058d007ed..a0cc2e59de 100644 +index b8113bd4bc..6ad19ce618 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -323,6 +323,7 @@ rtc_library("sample_counter") { @@ -1041,7 +1041,7 @@ index e058d007ed..a0cc2e59de 100644 if (rtc_build_json) { deps += [ "//third_party/jsoncpp" ] } else { -@@ -1206,6 +1210,7 @@ if (!build_with_chromium) { +@@ -1203,6 +1207,7 @@ if (!build_with_chromium) { } rtc_library("network") { @@ -1049,7 +1049,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "network.cc", -@@ -1244,16 +1249,20 @@ rtc_library("network") { +@@ -1241,16 +1246,20 @@ rtc_library("network") { deps += [ ":win32" ] } } @@ -1070,7 +1070,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "net_helper.cc", -@@ -1262,8 +1271,10 @@ rtc_library("net_helper") { +@@ -1259,8 +1268,10 @@ rtc_library("net_helper") { absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] deps = [ "system:rtc_export" ] } @@ -1081,7 +1081,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "socket_adapters.cc", -@@ -1283,6 +1294,7 @@ rtc_library("socket_adapters") { +@@ -1280,6 +1291,7 @@ rtc_library("socket_adapters") { ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -1089,7 +1089,7 @@ index e058d007ed..a0cc2e59de 100644 rtc_library("network_route") { sources = [ -@@ -1297,6 +1309,7 @@ rtc_library("network_route") { +@@ -1294,6 +1306,7 @@ rtc_library("network_route") { } rtc_library("async_tcp_socket") { @@ -1097,7 +1097,7 @@ index e058d007ed..a0cc2e59de 100644 sources = [ "async_tcp_socket.cc", "async_tcp_socket.h", -@@ -1315,8 +1328,10 @@ rtc_library("async_tcp_socket") { +@@ -1312,8 +1325,10 @@ rtc_library("async_tcp_socket") { "third_party/sigslot", ] } @@ -1108,7 +1108,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "async_udp_socket.cc", -@@ -1338,8 +1353,10 @@ rtc_library("async_udp_socket") { +@@ -1335,8 +1350,10 @@ rtc_library("async_udp_socket") { ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } @@ -1119,7 +1119,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "async_packet_socket.cc", -@@ -1357,6 +1374,7 @@ rtc_library("async_packet_socket") { +@@ -1354,6 +1371,7 @@ rtc_library("async_packet_socket") { "third_party/sigslot", ] } @@ -1127,7 +1127,7 @@ index e058d007ed..a0cc2e59de 100644 rtc_library("mdns_responder_interface") { sources = [ "mdns_responder_interface.h" ] -@@ -1369,6 +1387,7 @@ rtc_library("dscp") { +@@ -1366,6 +1384,7 @@ rtc_library("dscp") { } rtc_library("proxy_info") { @@ -1135,7 +1135,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "proxy_info.cc", -@@ -1379,6 +1398,7 @@ rtc_library("proxy_info") { +@@ -1376,6 +1395,7 @@ rtc_library("proxy_info") { ":socket_address", ] } @@ -1143,7 +1143,7 @@ index e058d007ed..a0cc2e59de 100644 rtc_library("file_rotating_stream") { sources = [ -@@ -1407,6 +1427,7 @@ rtc_library("data_rate_limiter") { +@@ -1404,6 +1424,7 @@ rtc_library("data_rate_limiter") { } rtc_library("unique_id_generator") { @@ -1151,7 +1151,7 @@ index e058d007ed..a0cc2e59de 100644 sources = [ "unique_id_generator.cc", "unique_id_generator.h", -@@ -1421,6 +1442,7 @@ rtc_library("unique_id_generator") { +@@ -1418,6 +1439,7 @@ rtc_library("unique_id_generator") { ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -1159,7 +1159,7 @@ index e058d007ed..a0cc2e59de 100644 rtc_library("crc32") { sources = [ -@@ -1448,6 +1470,7 @@ rtc_library("stream") { +@@ -1445,6 +1467,7 @@ rtc_library("stream") { } rtc_library("rtc_certificate_generator") { @@ -1167,7 +1167,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "rtc_certificate_generator.cc", -@@ -1465,8 +1488,10 @@ rtc_library("rtc_certificate_generator") { +@@ -1462,8 +1485,10 @@ rtc_library("rtc_certificate_generator") { "//third_party/abseil-cpp/absl/types:optional", ] } @@ -1178,7 +1178,7 @@ index e058d007ed..a0cc2e59de 100644 visibility = [ "*" ] sources = [ "helpers.cc", -@@ -1566,6 +1591,7 @@ rtc_library("ssl") { +@@ -1563,6 +1588,7 @@ rtc_library("ssl") { deps += [ ":win32" ] } } @@ -1186,7 +1186,7 @@ index e058d007ed..a0cc2e59de 100644 rtc_library("crypt_string") { sources = [ -@@ -1575,6 +1601,7 @@ rtc_library("crypt_string") { +@@ -1572,6 +1598,7 @@ rtc_library("crypt_string") { } rtc_library("http_common") { @@ -1194,7 +1194,7 @@ index e058d007ed..a0cc2e59de 100644 sources = [ "http_common.cc", "http_common.h", -@@ -1591,6 +1618,7 @@ rtc_library("http_common") { +@@ -1588,6 +1615,7 @@ rtc_library("http_common") { absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } @@ -1202,7 +1202,7 @@ index e058d007ed..a0cc2e59de 100644 rtc_source_set("gtest_prod") { sources = [ "gtest_prod_util.h" ] -@@ -2149,7 +2177,7 @@ if (rtc_include_tests) { +@@ -2146,7 +2174,7 @@ if (rtc_include_tests) { } } diff --git a/third_party/libwebrtc/moz-patch-stack/0065.patch b/third_party/libwebrtc/moz-patch-stack/0065.patch index 7db01c99eca2..b9f01b49cf49 100644 --- a/third_party/libwebrtc/moz-patch-stack/0065.patch +++ b/third_party/libwebrtc/moz-patch-stack/0065.patch @@ -29,7 +29,7 @@ index 116a50762e..b9c50c1644 100644 rtc_library("task_queue_test") { visibility = [ "*" ] diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn -index a0cc2e59de..8da12c7864 100644 +index 6ad19ce618..84b2f2ff32 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -738,10 +738,14 @@ if (is_mac || is_ios) { diff --git a/third_party/libwebrtc/rtc_base/BUILD.gn b/third_party/libwebrtc/rtc_base/BUILD.gn index 8da12c7864f3..84b2f2ff32ed 100644 --- a/third_party/libwebrtc/rtc_base/BUILD.gn +++ b/third_party/libwebrtc/rtc_base/BUILD.gn @@ -893,10 +893,7 @@ rtc_library("net_helpers") { "net_helpers.cc", "net_helpers.h", ] - deps = [ - ":net_test_helpers", - "system:rtc_export", - ] + deps = [ "system:rtc_export" ] if (is_android) { deps += [ ":ifaddrs_android" ] } diff --git a/third_party/libwebrtc/rtc_base/net_helpers.h b/third_party/libwebrtc/rtc_base/net_helpers.h index 5ce352875bae..a529f4f03f4d 100644 --- a/third_party/libwebrtc/rtc_base/net_helpers.h +++ b/third_party/libwebrtc/rtc_base/net_helpers.h @@ -21,8 +21,6 @@ #include "absl/strings/string_view.h" #include "rtc_base/system/rtc_export.h" -// TODO(mbonadei): Remove this, after Chromium tests have been migrated. -#include "rtc_base/net_test_helpers.h" namespace rtc {