nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1857862 - Vendor libwebrtc from 23fc2bee6b

Browse source 
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 <hta@webrtc.org>
    Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
    Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#40501}
This commit is contained in:
Andreas Pehrson 2023-10-16 17:35:11 +02:00
parent 1aee9ec589
commit 6be15e5e2e
7 changed files with 27 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
third_party/libwebrtc/README.moz-ff-commit vendored
View file

@ -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 # 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 # base of lastest vendoring
86a7969a6d 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

2
third_party/libwebrtc/README.mozilla vendored
View file

@ -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. 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 # ./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. 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.

2
third_party/libwebrtc/moz-patch-stack/0002.patch vendored
View file

@ -1562,7 +1562,7 @@ index 0474e7bc17..1953923f81 100644
std::unique_ptr<ScalableVideoController> svc_controller_; std::unique_ptr<ScalableVideoController> svc_controller_;
absl::optional<ScalabilityMode> scalability_mode_; absl::optional<ScalabilityMode> scalability_mode_;
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn 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 --- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn
@@ -458,6 +458,12 @@ rtc_library("logging") { @@ -458,6 +458,12 @@ rtc_library("logging") {

38
third_party/libwebrtc/moz-patch-stack/0031.patch vendored
View file

@ -1012,7 +1012,7 @@ index 730ec9bfdd..d473dbb74c 100644
"/config/external/nspr", "/config/external/nspr",
"/nsprpub/lib/ds", "/nsprpub/lib/ds",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn 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 --- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn
@@ -323,6 +323,7 @@ rtc_library("sample_counter") { @@ -323,6 +323,7 @@ rtc_library("sample_counter") {
@ -1041,7 +1041,7 @@ index e058d007ed..a0cc2e59de 100644
if (rtc_build_json) { if (rtc_build_json) {
deps += [ "//third_party/jsoncpp" ] deps += [ "//third_party/jsoncpp" ]
} else { } else {
@@ -1206,6 +1210,7 @@ if (!build_with_chromium) { @@ -1203,6 +1207,7 @@ if (!build_with_chromium) {
} }
rtc_library("network") { rtc_library("network") {
@ -1049,7 +1049,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"network.cc", "network.cc",
@@ -1244,16 +1249,20 @@ rtc_library("network") { @@ -1241,16 +1246,20 @@ rtc_library("network") {
deps += [ ":win32" ] deps += [ ":win32" ]
} }
} }
@ -1070,7 +1070,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"net_helper.cc", "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" ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
deps = [ "system:rtc_export" ] deps = [ "system:rtc_export" ]
} }
@ -1081,7 +1081,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"socket_adapters.cc", "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" ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
} }
@ -1089,7 +1089,7 @@ index e058d007ed..a0cc2e59de 100644
rtc_library("network_route") { rtc_library("network_route") {
sources = [ sources = [
@@ -1297,6 +1309,7 @@ rtc_library("network_route") { @@ -1294,6 +1306,7 @@ rtc_library("network_route") {
} }
rtc_library("async_tcp_socket") { rtc_library("async_tcp_socket") {
@ -1097,7 +1097,7 @@ index e058d007ed..a0cc2e59de 100644
sources = [ sources = [
"async_tcp_socket.cc", "async_tcp_socket.cc",
"async_tcp_socket.h", "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", "third_party/sigslot",
] ]
} }
@ -1108,7 +1108,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"async_udp_socket.cc", "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" ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
} }
@ -1119,7 +1119,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"async_packet_socket.cc", "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", "third_party/sigslot",
] ]
} }
@ -1127,7 +1127,7 @@ index e058d007ed..a0cc2e59de 100644
rtc_library("mdns_responder_interface") { rtc_library("mdns_responder_interface") {
sources = [ "mdns_responder_interface.h" ] sources = [ "mdns_responder_interface.h" ]
@@ -1369,6 +1387,7 @@ rtc_library("dscp") { @@ -1366,6 +1384,7 @@ rtc_library("dscp") {
} }
rtc_library("proxy_info") { rtc_library("proxy_info") {
@ -1135,7 +1135,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"proxy_info.cc", "proxy_info.cc",
@@ -1379,6 +1398,7 @@ rtc_library("proxy_info") { @@ -1376,6 +1395,7 @@ rtc_library("proxy_info") {
":socket_address", ":socket_address",
] ]
} }
@ -1143,7 +1143,7 @@ index e058d007ed..a0cc2e59de 100644
rtc_library("file_rotating_stream") { rtc_library("file_rotating_stream") {
sources = [ sources = [
@@ -1407,6 +1427,7 @@ rtc_library("data_rate_limiter") { @@ -1404,6 +1424,7 @@ rtc_library("data_rate_limiter") {
} }
rtc_library("unique_id_generator") { rtc_library("unique_id_generator") {
@ -1151,7 +1151,7 @@ index e058d007ed..a0cc2e59de 100644
sources = [ sources = [
"unique_id_generator.cc", "unique_id_generator.cc",
"unique_id_generator.h", "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" ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
} }
@ -1159,7 +1159,7 @@ index e058d007ed..a0cc2e59de 100644
rtc_library("crc32") { rtc_library("crc32") {
sources = [ sources = [
@@ -1448,6 +1470,7 @@ rtc_library("stream") { @@ -1445,6 +1467,7 @@ rtc_library("stream") {
} }
rtc_library("rtc_certificate_generator") { rtc_library("rtc_certificate_generator") {
@ -1167,7 +1167,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"rtc_certificate_generator.cc", "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", "//third_party/abseil-cpp/absl/types:optional",
] ]
} }
@ -1178,7 +1178,7 @@ index e058d007ed..a0cc2e59de 100644
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"helpers.cc", "helpers.cc",
@@ -1566,6 +1591,7 @@ rtc_library("ssl") { @@ -1563,6 +1588,7 @@ rtc_library("ssl") {
deps += [ ":win32" ] deps += [ ":win32" ]
} }
} }
@ -1186,7 +1186,7 @@ index e058d007ed..a0cc2e59de 100644
rtc_library("crypt_string") { rtc_library("crypt_string") {
sources = [ sources = [
@@ -1575,6 +1601,7 @@ rtc_library("crypt_string") { @@ -1572,6 +1598,7 @@ rtc_library("crypt_string") {
} }
rtc_library("http_common") { rtc_library("http_common") {
@ -1194,7 +1194,7 @@ index e058d007ed..a0cc2e59de 100644
sources = [ sources = [
"http_common.cc", "http_common.cc",
"http_common.h", "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" ] absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
} }
@ -1202,7 +1202,7 @@ index e058d007ed..a0cc2e59de 100644
rtc_source_set("gtest_prod") { rtc_source_set("gtest_prod") {
sources = [ "gtest_prod_util.h" ] sources = [ "gtest_prod_util.h" ]
@@ -2149,7 +2177,7 @@ if (rtc_include_tests) { @@ -2146,7 +2174,7 @@ if (rtc_include_tests) {
} }
} }

2
third_party/libwebrtc/moz-patch-stack/0065.patch vendored
View file

@ -29,7 +29,7 @@ index 116a50762e..b9c50c1644 100644
rtc_library("task_queue_test") { rtc_library("task_queue_test") {
visibility = [ "*" ] visibility = [ "*" ]
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn 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 --- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn
@@ -738,10 +738,14 @@ if (is_mac || is_ios) { @@ -738,10 +738,14 @@ if (is_mac || is_ios) {

5
third_party/libwebrtc/rtc_base/BUILD.gn vendored
View file

@ -893,10 +893,7 @@ rtc_library("net_helpers") {
"net_helpers.cc", "net_helpers.cc",
"net_helpers.h", "net_helpers.h",
] ]
deps = [ deps = [ "system:rtc_export" ]
":net_test_helpers",
"system:rtc_export",
]
if (is_android) { if (is_android) {
deps += [ ":ifaddrs_android" ] deps += [ ":ifaddrs_android" ]
} }

2
third_party/libwebrtc/rtc_base/net_helpers.h vendored
View file

@ -21,8 +21,6 @@
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "rtc_base/system/rtc_export.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 { namespace rtc {