tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

commit 9d456d361e7c74c0f473b0835309155939865938
parent 4ce6da589eaab44ae83ed9c9bb18ee6b4194da11
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed,  8 Oct 2025 18:23:13 -0500

Bug 1993083 - Vendor libwebrtc from 9dccd0645f

Upstream commit: https://webrtc.googlesource.com/src/+/9dccd0645f98cef4452cbc2dabac25ad181ccb77
    Remove rtc_allow_deprecated_namespaces gn flag

    Migration to one namespace is complete. Time to celebrate.

    Bug: webrtc:4222596
    Change-Id: I29d86638586716e3159fa68b5582659291aac14b
    No-Iwyu: Change in diffbase
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/398121
    Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
    Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45061}

Diffstat:
Mthird_party/libwebrtc/BUILD.gn | 4----
Mthird_party/libwebrtc/README.mozilla.last-vendor | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0001.patch | 2+-
Mthird_party/libwebrtc/moz-patch-stack/s0027.patch | 18+++++++++---------
Mthird_party/libwebrtc/moz-patch-stack/s0034.patch | 8++++----
Mthird_party/libwebrtc/moz-patch-stack/s0045.patch | 6+++---
Mthird_party/libwebrtc/moz-patch-stack/s0055.patch | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0069.patch | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0084.patch | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0093.patch | 6+++---
Mthird_party/libwebrtc/moz-patch-stack/s0101.patch | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0102.patch | 6+++---
Mthird_party/libwebrtc/moz-patch-stack/s0103.patch | 14+++++++-------
Mthird_party/libwebrtc/moz-patch-stack/s0104.patch | 8++++----
Mthird_party/libwebrtc/moz-patch-stack/s0106.patch | 6+++---
Mthird_party/libwebrtc/moz-patch-stack/s0108.patch | 10+++++-----
Mthird_party/libwebrtc/moz-patch-stack/s0112.patch | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0117.patch | 2+-
Mthird_party/libwebrtc/moz-patch-stack/s0122.patch | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0130.patch | 6+++---
Mthird_party/libwebrtc/tools_webrtc/mb/mb_config.pyl | 7-------
Mthird_party/libwebrtc/webrtc.gni | 6------
22 files changed, 60 insertions(+), 77 deletions(-)

diff --git a/third_party/libwebrtc/BUILD.gn b/third_party/libwebrtc/BUILD.gn @@ -257,10 +257,6 @@ config("common_inherited_config") { if (is_ubsan) { cflags += [ "-fsanitize=float-cast-overflow" ] } - - if (rtc_allow_deprecated_namespaces) { - defines += [ "WEBRTC_ALLOW_DEPRECATED_NAMESPACES" ] - } } # TODO(bugs.webrtc.org/9693): Remove the possibility to suppress this warning diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T23:21:55.042874+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T23:23:03.581434+00:00. # base of lastest vendoring -0d4e5e903e +9dccd0645f diff --git a/third_party/libwebrtc/moz-patch-stack/s0001.patch b/third_party/libwebrtc/moz-patch-stack/s0001.patch @@ -1501,7 +1501,7 @@ index b7933130bd..428fc9615d 100644 vcm_ = nullptr; } diff --git a/webrtc.gni b/webrtc.gni -index 103983dec4..4fed37040d 100644 +index 30ca2afdd3..519e0849d2 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -123,7 +123,7 @@ declare_args() { diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -116,7 +116,7 @@ index 1b112b34c0..18cf5d67f7 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 c903beed96..a9cf2a6b1c 100644 +index fd77e776cd..9d79e5e129 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -33,7 +33,7 @@ if (is_android) { @@ -139,7 +139,7 @@ index c903beed96..a9cf2a6b1c 100644 if (!rtc_builtin_ssl_root_certificates) { defines += [ "WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS" ] } -@@ -499,9 +503,11 @@ config("common_config") { +@@ -495,9 +499,11 @@ config("common_config") { } } @@ -151,7 +151,7 @@ index c903beed96..a9cf2a6b1c 100644 if (!rtc_build_ssl) { config("external_ssl_library") { -@@ -564,6 +570,33 @@ if (!build_with_chromium) { +@@ -560,6 +566,33 @@ if (!build_with_chromium) { "sdk", "video", ] @@ -185,7 +185,7 @@ index c903beed96..a9cf2a6b1c 100644 if (rtc_include_builtin_audio_codecs) { deps += [ -@@ -576,6 +609,16 @@ if (!build_with_chromium) { +@@ -572,6 +605,16 @@ if (!build_with_chromium) { deps += [ "api/video:video_frame", "api/video:video_rtp_headers", @@ -1275,7 +1275,7 @@ index c1acd56382..7abdf541f8 100644 "../api:sequence_checker", "../api/adaptation:resource_adaptation_api", diff --git a/webrtc.gni b/webrtc.gni -index 4fed37040d..ec55e54b9d 100644 +index 519e0849d2..aabdb21780 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -35,6 +35,11 @@ if (is_mac) { @@ -1347,7 +1347,7 @@ index 4fed37040d..ec55e54b9d 100644 # Experimental: enable use of Android AAudio which requires Android SDK 26 or above # and NDK r16 or above. rtc_enable_android_aaudio = false -@@ -295,7 +302,7 @@ declare_args() { +@@ -290,7 +297,7 @@ declare_args() { rtc_build_json = !build_with_mozilla rtc_build_libsrtp = !build_with_mozilla rtc_build_libvpx = !build_with_mozilla @@ -1356,7 +1356,7 @@ index 4fed37040d..ec55e54b9d 100644 rtc_build_opus = !build_with_mozilla rtc_build_ssl = !build_with_mozilla -@@ -304,7 +311,7 @@ declare_args() { +@@ -299,7 +306,7 @@ declare_args() { # Chromium uses its own IO handling, so the internal ADM is only built for # standalone WebRTC. @@ -1365,7 +1365,7 @@ index 4fed37040d..ec55e54b9d 100644 # Set this to true to enable the avx2 support in webrtc. # TODO: Make sure that AVX2 works also for non-clang compilers. -@@ -347,6 +354,9 @@ declare_args() { +@@ -342,6 +349,9 @@ declare_args() { rtc_enable_grpc = rtc_enable_protobuf && (is_linux || is_mac) } @@ -1375,7 +1375,7 @@ index 4fed37040d..ec55e54b9d 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" -@@ -1220,7 +1230,7 @@ if (is_mac || is_ios) { +@@ -1214,7 +1224,7 @@ if (is_mac || is_ios) { } } diff --git a/third_party/libwebrtc/moz-patch-stack/s0034.patch b/third_party/libwebrtc/moz-patch-stack/s0034.patch @@ -20,10 +20,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/58f47eacaf10d12e2 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index a9cf2a6b1c..efc744694d 100644 +index 9d79e5e129..acf69ea940 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -442,12 +442,12 @@ config("common_config") { +@@ -438,12 +438,12 @@ config("common_config") { } } @@ -38,7 +38,7 @@ index a9cf2a6b1c..efc744694d 100644 defines += [ "WEBRTC_ARCH_ARM" ] if (arm_version >= 7) { defines += [ "WEBRTC_ARCH_ARM_V7" ] -@@ -457,7 +457,7 @@ config("common_config") { +@@ -453,7 +453,7 @@ config("common_config") { } } @@ -276,7 +276,7 @@ index ff3f4d5b93..b95f1aa2d0 100644 config("x11_config") { if (rtc_use_x11_extensions) { diff --git a/webrtc.gni b/webrtc.gni -index ec55e54b9d..a11f4b9ab9 100644 +index aabdb21780..6f7c987bd2 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -169,13 +169,13 @@ declare_args() { diff --git a/third_party/libwebrtc/moz-patch-stack/s0045.patch b/third_party/libwebrtc/moz-patch-stack/s0045.patch @@ -18,7 +18,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0300b32b7de70fb89 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index efc744694d..df103651c2 100644 +index acf69ea940..d55f06b52b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -222,6 +222,9 @@ config("common_inherited_config") { @@ -74,10 +74,10 @@ index f057d4b7c3..61d8af14c2 100644 #endif // defined(WEBRTC_POSIX) } diff --git a/webrtc.gni b/webrtc.gni -index a11f4b9ab9..11630c2048 100644 +index 6f7c987bd2..3847a3c833 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -364,7 +364,7 @@ rtc_opus_dir = "//third_party/opus" +@@ -359,7 +359,7 @@ rtc_opus_dir = "//third_party/opus" # Desktop capturer is supported only on Windows, OSX and Linux. rtc_desktop_capture_supported = diff --git a/third_party/libwebrtc/moz-patch-stack/s0055.patch b/third_party/libwebrtc/moz-patch-stack/s0055.patch @@ -11,10 +11,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b0658888969395dca 2 files changed, 10 insertions(+) diff --git a/BUILD.gn b/BUILD.gn -index df103651c2..8c481ad633 100644 +index d55f06b52b..21ce290a12 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -625,6 +625,10 @@ if (!build_with_chromium) { +@@ -621,6 +621,10 @@ if (!build_with_chromium) { ] } diff --git a/third_party/libwebrtc/moz-patch-stack/s0069.patch b/third_party/libwebrtc/moz-patch-stack/s0069.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/46fb51c90709be64c 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni -index 11630c2048..b77a0ce638 100644 +index 3847a3c833..e9dea332d0 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -315,7 +315,7 @@ declare_args() { +@@ -310,7 +310,7 @@ declare_args() { # Set this to true to enable the avx2 support in webrtc. # TODO: Make sure that AVX2 works also for non-clang compilers. diff --git a/third_party/libwebrtc/moz-patch-stack/s0084.patch b/third_party/libwebrtc/moz-patch-stack/s0084.patch @@ -11,10 +11,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/2185cab977988fd4a 3 files changed, 16 insertions(+) diff --git a/BUILD.gn b/BUILD.gn -index 8c481ad633..f7ac3da936 100644 +index 21ce290a12..9a4f0f1b97 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -610,6 +610,7 @@ if (!build_with_chromium) { +@@ -606,6 +606,7 @@ if (!build_with_chromium) { if (build_with_mozilla) { deps += [ diff --git a/third_party/libwebrtc/moz-patch-stack/s0093.patch b/third_party/libwebrtc/moz-patch-stack/s0093.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b050c455caa1d24a0 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index f7ac3da936..7b3ea1ec50 100644 +index 9a4f0f1b97..74f7c78e12 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -282,6 +282,7 @@ config("rtc_prod_config") { +@@ -278,6 +278,7 @@ config("rtc_prod_config") { } group("tracing") { @@ -21,7 +21,7 @@ index f7ac3da936..7b3ea1ec50 100644 all_dependent_configs = [ "//third_party/perfetto/gn:public_config" ] if (rtc_use_perfetto) { if (build_with_chromium) { -@@ -298,6 +299,7 @@ group("tracing") { +@@ -294,6 +295,7 @@ group("tracing") { [ "//third_party/perfetto/include/perfetto/tracing" ] } } diff --git a/third_party/libwebrtc/moz-patch-stack/s0101.patch b/third_party/libwebrtc/moz-patch-stack/s0101.patch @@ -52,10 +52,10 @@ index 606c1161bc..16290b35f7 100644 rtc_library("encoded_frame") { diff --git a/webrtc.gni b/webrtc.gni -index b77a0ce638..bb386f6e3f 100644 +index e9dea332d0..40679b2358 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -502,8 +502,8 @@ all_poison_types = [ +@@ -496,8 +496,8 @@ all_poison_types = [ "software_video_codecs", ] diff --git a/third_party/libwebrtc/moz-patch-stack/s0102.patch b/third_party/libwebrtc/moz-patch-stack/s0102.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/45b99d1ba95b46896 1 file changed, 71 insertions(+) diff --git a/webrtc.gni b/webrtc.gni -index bb386f6e3f..df16269eb4 100644 +index 40679b2358..a448f64dd3 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -706,6 +706,36 @@ template("rtc_source_set") { +@@ -700,6 +700,36 @@ template("rtc_source_set") { deps += [ "//third_party/abseil-cpp:absl" ] } } @@ -50,7 +50,7 @@ index bb386f6e3f..df16269eb4 100644 } } -@@ -940,6 +970,47 @@ template("rtc_library") { +@@ -934,6 +964,47 @@ template("rtc_library") { deps += [ "//third_party/abseil-cpp:absl" ] } } diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -75,7 +75,7 @@ index cdbd705ec2..4ee826ec58 100644 # The python interpreter to use by default. On Windows, this will look # for vpython3.exe and vpython3.bat. diff --git a/BUILD.gn b/BUILD.gn -index 7b3ea1ec50..2e4ebfda99 100644 +index 74f7c78e12..f5aa3cc9fe 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -21,15 +21,15 @@ @@ -98,7 +98,7 @@ index 7b3ea1ec50..2e4ebfda99 100644 import("//third_party/jni_zero/jni_zero.gni") } -@@ -537,7 +537,7 @@ if (!build_with_chromium) { +@@ -533,7 +533,7 @@ if (!build_with_chromium) { sources = [] complete_static_lib = true @@ -107,7 +107,7 @@ index 7b3ea1ec50..2e4ebfda99 100644 defines = [] deps = [ -@@ -849,7 +849,7 @@ rtc_static_library("dcsctp") { +@@ -845,7 +845,7 @@ rtc_static_library("dcsctp") { visibility = [ "//:default" ] sources = [] complete_static_lib = true @@ -116,7 +116,7 @@ index 7b3ea1ec50..2e4ebfda99 100644 defines = [] deps = [ "net/dcsctp/public:factory", -@@ -884,7 +884,7 @@ group("poison_software_video_codecs") { +@@ -880,7 +880,7 @@ group("poison_software_video_codecs") { if (!build_with_chromium) { # Write debug logs to gn_logs.txt. # This is also required for Siso builds. @@ -804,7 +804,7 @@ index d8f0eba11f..eb25867dc9 100644 } } diff --git a/webrtc.gni b/webrtc.gni -index df16269eb4..51de7fba13 100644 +index a448f64dd3..2332abaee9 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -5,12 +5,12 @@ @@ -852,7 +852,7 @@ index df16269eb4..51de7fba13 100644 } if (build_with_chromium) { -@@ -387,8 +387,8 @@ rtc_common_configs = [ webrtc_root + ":common_config" ] +@@ -382,8 +382,8 @@ rtc_common_configs = [ webrtc_root + ":common_config" ] if (is_mac || is_ios) { if (filter_include(default_compiler_configs, @@ -863,7 +863,7 @@ index df16269eb4..51de7fba13 100644 } } -@@ -407,7 +407,7 @@ rtc_common_inherited_config = webrtc_root + ":common_inherited_config" +@@ -401,7 +401,7 @@ rtc_common_inherited_config = webrtc_root + ":common_inherited_config" # Common configs to remove or add in all rtc targets. rtc_remove_configs = [] if (!build_with_chromium && is_clang) { diff --git a/third_party/libwebrtc/moz-patch-stack/s0104.patch b/third_party/libwebrtc/moz-patch-stack/s0104.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/f18c05287ce831369 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/webrtc.gni b/webrtc.gni -index 51de7fba13..a7ad4e2052 100644 +index 2332abaee9..2fe407181c 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -551,7 +551,7 @@ template("rtc_test") { +@@ -545,7 +545,7 @@ template("rtc_test") { min_sdk_version = 21 target_sdk_version = 24 deps += [ @@ -22,7 +22,7 @@ index 51de7fba13..a7ad4e2052 100644 webrtc_root + "sdk/android:native_test_jni_onload", webrtc_root + "sdk/android:base_java", webrtc_root + "test:native_test_java", -@@ -1006,11 +1006,21 @@ template("rtc_library") { +@@ -1000,11 +1000,21 @@ template("rtc_library") { modified_deps = [] foreach (dep, deps) { newdep = string_replace(dep, "//third_party/", "//libwebrtc/third_party/") @@ -44,7 +44,7 @@ index 51de7fba13..a7ad4e2052 100644 } } -@@ -1048,7 +1058,7 @@ template("rtc_executable") { +@@ -1042,7 +1052,7 @@ template("rtc_executable") { if (is_win) { deps += [ # Give executables the default manifest on Windows (a no-op elsewhere). diff --git a/third_party/libwebrtc/moz-patch-stack/s0106.patch b/third_party/libwebrtc/moz-patch-stack/s0106.patch @@ -9,10 +9,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/90a33b06e51017d25 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn -index 2e4ebfda99..8964d077bf 100644 +index f5aa3cc9fe..9f8d5e314f 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -566,6 +566,7 @@ if (!build_with_chromium) { +@@ -562,6 +562,7 @@ if (!build_with_chromium) { "call", "common_audio", "common_video", @@ -20,7 +20,7 @@ index 2e4ebfda99..8964d077bf 100644 "logging:rtc_event_log_api", "media", "modules", -@@ -846,7 +847,7 @@ if (rtc_include_tests && !build_with_chromium) { +@@ -842,7 +843,7 @@ if (rtc_include_tests && !build_with_chromium) { # Build target for standalone dcsctp rtc_static_library("dcsctp") { # Only the root target should depend on this. diff --git a/third_party/libwebrtc/moz-patch-stack/s0108.patch b/third_party/libwebrtc/moz-patch-stack/s0108.patch @@ -16,10 +16,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/4527c41ef71d7683c 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/BUILD.gn b/BUILD.gn -index 8964d077bf..123739a1ff 100644 +index 9f8d5e314f..67d6d66a9e 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -523,6 +523,9 @@ if (!rtc_build_ssl) { +@@ -519,6 +519,9 @@ if (!rtc_build_ssl) { "crypto", "ssl", ] @@ -29,7 +29,7 @@ index 8964d077bf..123739a1ff 100644 } } -@@ -616,6 +619,7 @@ if (!build_with_chromium) { +@@ -612,6 +615,7 @@ if (!build_with_chromium) { "api/environment:environment_factory", "api/video:video_frame", "api/video:video_rtp_headers", @@ -147,7 +147,7 @@ index 206c90bff5..8d869bc92e 100644 rtc_library("ssl") { if (!build_with_mozilla) { diff --git a/webrtc.gni b/webrtc.gni -index a7ad4e2052..269a1611a6 100644 +index 2fe407181c..34fae67f24 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -125,7 +125,7 @@ declare_args() { @@ -159,7 +159,7 @@ index a7ad4e2052..269a1611a6 100644 # Enable when an external authentication mechanism is used for performing # packet authentication for RTP packets instead of libsrtp. -@@ -355,7 +355,7 @@ declare_args() { +@@ -350,7 +350,7 @@ declare_args() { } # Enable liboam only on non-mozilla builds. diff --git a/third_party/libwebrtc/moz-patch-stack/s0112.patch b/third_party/libwebrtc/moz-patch-stack/s0112.patch @@ -10,10 +10,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/27c29807e6f46562d 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn -index 123739a1ff..ff12ae0545 100644 +index 67d6d66a9e..398ddc540e 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -616,6 +616,7 @@ if (!build_with_chromium) { +@@ -612,6 +612,7 @@ if (!build_with_chromium) { if (build_with_mozilla) { deps += [ diff --git a/third_party/libwebrtc/moz-patch-stack/s0117.patch b/third_party/libwebrtc/moz-patch-stack/s0117.patch @@ -18,7 +18,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c8cf67108972d5cae 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni -index 269a1611a6..785492fe49 100644 +index 34fae67f24..2b3ec1be86 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -145,7 +145,7 @@ declare_args() { diff --git a/third_party/libwebrtc/moz-patch-stack/s0122.patch b/third_party/libwebrtc/moz-patch-stack/s0122.patch @@ -8,10 +8,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/6038962cc8531f7ba 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc.gni b/webrtc.gni -index 785492fe49..1e87de20e5 100644 +index 2b3ec1be86..8bf7f625ba 100644 --- a/webrtc.gni +++ b/webrtc.gni -@@ -343,7 +343,7 @@ declare_args() { +@@ -338,7 +338,7 @@ declare_args() { rtc_disable_metrics = false # Enables an experimental rust version of base64 for building and testing. diff --git a/third_party/libwebrtc/moz-patch-stack/s0130.patch b/third_party/libwebrtc/moz-patch-stack/s0130.patch @@ -9,10 +9,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/43de54a6e52daf0a0 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn -index ff12ae0545..1ac89c4090 100644 +index 398ddc540e..ad8d9970ee 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -317,6 +317,17 @@ config("common_config") { +@@ -313,6 +313,17 @@ config("common_config") { cflags_objc = [] defines = [] @@ -30,7 +30,7 @@ index ff12ae0545..1ac89c4090 100644 if (rtc_enable_protobuf) { defines += [ "WEBRTC_ENABLE_PROTOBUF=1" ] } else { -@@ -418,7 +429,7 @@ config("common_config") { +@@ -414,7 +425,7 @@ config("common_config") { # "-Wnested-externs", (C/Obj-C only) ] cflags_objc += [ "-Wstrict-prototypes" ] diff --git a/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl b/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl @@ -526,7 +526,6 @@ 'debug', 'remoteexec', 'strict_field_trials', - 'disallow_deprecated_namespaces' ], }, 'debug_static_bot': { @@ -535,16 +534,11 @@ 'minimal_symbols', 'remoteexec', 'strict_field_trials', - 'disallow_deprecated_namespaces', ], }, 'disable_trace_events': { 'gn_args': 'rtc_disable_trace_events=true', }, - # TODO(b/42232595): Remove once the GN flag is removed. - 'disallow_deprecated_namespaces': { - 'gn_args': 'rtc_allow_deprecated_namespaces=false' - }, 'dummy_audio_file_devices': { 'gn_args': 'rtc_use_dummy_audio_file_devices=true', }, @@ -627,7 +621,6 @@ 'pure_release_bot', 'dcheck_always_on', 'strict_field_trials', - 'disallow_deprecated_namespaces', ], }, 'remoteexec': { diff --git a/third_party/libwebrtc/webrtc.gni b/third_party/libwebrtc/webrtc.gni @@ -277,11 +277,6 @@ declare_args() { # When true, include the Perfetto library. rtc_use_perfetto = false - - # When true allows exports from deprecated namespaces. - # This will be set to false on Jun 23 2025. See bugs.webrtc.org/42232595 - # for details. - rtc_allow_deprecated_namespaces = true } if (!build_with_mozilla) { @@ -394,7 +389,6 @@ if (is_mac || is_ios) { if (build_with_chromium) { rtc_use_perfetto = true - rtc_allow_deprecated_namespaces = false } # Global public configuration that should be applied to all WebRTC targets. You