mail/thunderbird: update to 151.0 (rc1) HEAD 2026Q2

Release Notes (soon): https://www.thunderbird.net/en-US/thunderbird/151.0/releasenotes/ (cherry picked from commit 6f30752564b9e3ee44e8a1a1eeb5b0dfd2dd66ee)
author: Christoph Moench-Tegeder <cmt@FreeBSD.org> 2026-05-15 21:15:11 +0100
committer: Christoph Moench-Tegeder <cmt@FreeBSD.org> 2026-05-15 21:17:10 +0100
commit: 7086525af5d39c9964269bbe7c00835f4d72f075 (patch) (diff)
tree: 1f109b529048ac7e7a5fbb30a754d7042d08ad0a
download: ports-2026Q2.tar.gz
previous commit: d1e0884c65118173640c42e392f8dc8093e62c12 (www/firefox-esr: update to 140.11.0 (rc2))
14 files changed, 4115 insertions, 3780 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 9ea82d73b668..602f13a409cc 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	thunderbird
-DISTVERSION=	150.0.2
-PORTREVISION=	1
+DISTVERSION=	151.0
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
@@ -11,7 +10,7 @@ COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 WWW=		https://www.thunderbird.net/
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.122.2:security/nss \
+		nss>=3.123.1:security/nss \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=10.1.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index f0fc2cd9944d..4e8936df2669 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1778175713
-SHA256 (thunderbird-150.0.2.source.tar.xz) = 87d03a64de92de565328c0ea7ab921101217da4188fbee3f444f91b76cac1e5c
-SIZE (thunderbird-150.0.2.source.tar.xz) = 836019656
+TIMESTAMP = 1778871160
+SHA256 (thunderbird-151.0.source.tar.xz) = c8a8ca3ca31dffa75eca3f330e03c390bff6fa24333f180d9e9a994dfb4306ae
+SIZE (thunderbird-151.0.source.tar.xz) = 919819268
diff --git a/mail/thunderbird/files/patch-bug1504834_comment10 b/mail/thunderbird/files/patch-bug1504834_comment10
deleted file mode 100644
index 2d584adb17ef..000000000000
--- a/mail/thunderbird/files/patch-bug1504834_comment10
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c10
-https://bug1504834.bmoattachments.org/attachment.cgi?id=9111147
-mozilla-bmo1504834-part4.patch
-
-# HG changeset patch
-# Parent  46ea866ca3acb8bb5e1709ceb799b9c94f591dec
-Problem description: Tab-titles that are too long to fit into a tab get faded out.
-                     On big endian this is broken and instead of fading out, the 
-                     tab gets white and the font transparent, leading to an unreadable
-                     tab-title
-Solution: This is not a real solution, but a hack. The real solution would have been
-          to byte-swap the correct buffer, but I could not find it.
-          So the next best thing is to deactivate the fading-effect. Now all tab-titles
-          are readable, albeit not as pretty to look at as they could be. 
-Side-effects: I have not yet found an unwanted side-effect.
-
-diff --git gfx/2d/DrawTargetSkia.cpp gfx/2d/DrawTargetSkia.cpp
-index 6bbef8d..161b96f 100644
---- gfx/2d/DrawTargetSkia.cpp
-+++ gfx/2d/DrawTargetSkia.cpp
-@@ -1903,6 +1903,14 @@ void DrawTargetSkia::PushLayerWithBlend(bool aOpaque, Float aOpacity,
-       SkCanvas::kPreserveLCDText_SaveLayerFlag |
-           (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
- 
-+#if MOZ_BIG_ENDIAN()
-+  // Pushing a layer where an aMask is defined produces wrong output.
-+  // We _should_ endian swap the data, but I couldn't find a workable way to do so
-+  // Therefore I deactivate those layers in the meantime.
-+  // The result is: Tab-titles that are longer than the available space should be faded out.
-+  //                The fading doesn't work, so we deactivate the fading-effect here.
-+  if (!aMask)
-+#endif
-   mCanvas->saveLayer(saveRec);
- 
-   SetPermitSubpixelAA(aOpaque);
-
diff --git a/mail/thunderbird/files/patch-bug1504834_comment5 b/mail/thunderbird/files/patch-bug1504834_comment5
index b9897e0b7f66..ee4d57b507a1 100644
--- a/mail/thunderbird/files/patch-bug1504834_comment5
+++ b/mail/thunderbird/files/patch-bug1504834_comment5
@@ -4,10 +4,10 @@ Rough progress patch
 
 
 diff --git gfx/2d/DrawTargetSkia.cpp gfx/2d/DrawTargetSkia.cpp
-index 6bbef8d..82b04ba 100644
+index 050d9ae44e13..6f9bc7a88317 100644
 --- gfx/2d/DrawTargetSkia.cpp
 +++ gfx/2d/DrawTargetSkia.cpp
-@@ -154,8 +154,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& aSize, const Rect* aBounds,
+@@ -166,8 +166,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& aSize, const Rect* aBounds,
    return surfaceBounds.Intersect(bounds);
  }
  
@@ -17,29 +17,11 @@ index 6bbef8d..82b04ba 100644
  
  static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
                               const int32_t aStride, SurfaceFormat aFormat) {
-diff --git gfx/2d/Types.h gfx/2d/Types.h
-index 6b3bdc7..7c6c342 100644
---- gfx/2d/Types.h
-+++ gfx/2d/Types.h
-@@ -90,15 +90,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
--#if MOZ_LITTLE_ENDIAN()
-   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
-   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
--#elif MOZ_BIG_ENDIAN()
--  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
--  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
--#else
--#  error "bad endianness"
--#endif
- 
-   // The following values are OS and endian-independent synonyms.
-   //
---- gfx/skia/skia/modules/skcms/skcms.cc.orig
+diff --git gfx/skia/skia/modules/skcms/skcms.cc gfx/skia/skia/modules/skcms/skcms.cc
+index 00b19eca7ed3..e6426c296df9 100644
+--- gfx/skia/skia/modules/skcms/skcms.cc
 +++ gfx/skia/skia/modules/skcms/skcms.cc
-@@ -30,6 +30,8 @@
+@@ -31,6 +31,8 @@
          #include <avx512fintrin.h>
          #include <avx512dqintrin.h>
      #endif
@@ -47,8 +29,8 @@ index 6b3bdc7..7c6c342 100644
 +    #define SKCMS_PORTABLE
  #endif
  
- static bool runtime_cpu_detection = true;
-@@ -324,20 +326,28 @@
+ using namespace skcms_private;
+@@ -379,20 +381,28 @@ enum {
  static uint16_t read_big_u16(const uint8_t* ptr) {
      uint16_t be;
      memcpy(&be, ptr, sizeof(be));
diff --git a/mail/thunderbird/files/patch-bug1626236 b/mail/thunderbird/files/patch-bug1626236
deleted file mode 100644
index f6064dc9e47f..000000000000
--- a/mail/thunderbird/files/patch-bug1626236
+++ /dev/null
@@ -1,92 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1626236
-https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
-
-# HG changeset patch
-# User msirringhaus@suse.de
-# Date 1582805876 -3600
-#      Thu Feb 27 13:17:56 2020 +0100
-# Node ID cc3d09abea31068e57f1ab918782f9f86fc6a158
-# Parent  9cd90914846f667f18babc491a74c164ae5d6e9f
-imported patch decoder_workaround.patch
-
-diff --git image/decoders/nsGIFDecoder2.cpp image/decoders/nsGIFDecoder2.cpp
-index 2776cff50c9d..1e2511459b18 100644
---- image/decoders/nsGIFDecoder2.cpp
-+++ image/decoders/nsGIFDecoder2.cpp
-@@ -488,6 +488,9 @@ void nsGIFDecoder2::ConvertColormap(uint32_t* aColormap, uint32_t aColors) {
-   MOZ_ASSERT(mSwizzleFn);
-   uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
-   mSwizzleFn(data, data, aColors);
-+#if MOZ_BIG_ENDIAN()
-+  SwizzleRow(SurfaceFormat::A8R8G8B8, SurfaceFormat::B8G8R8A8)(data, data, aColors);
-+#endif
- }
- 
- LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
-diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp
-index c34757d08463..69c21aac6b25 100644
---- image/decoders/nsJPEGDecoder.cpp
-+++ image/decoders/nsJPEGDecoder.cpp
-@@ -297,6 +297,9 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData(
-         case JCS_YCbCr:
-           // By default, we will output directly to BGRA. If we need to apply
-           // special color transforms, this may change.
-+#if MOZ_BIG_ENDIAN()
-+          mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
-+#else
-           switch (SurfaceFormat::OS_RGBX) {
-             case SurfaceFormat::B8G8R8X8:
-               mInfo.out_color_space = JCS_EXT_BGRX;
-@@ -311,6 +314,7 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData(
-               mState = JPEG_ERROR;
-               return Transition::TerminateFailure();
-           }
-+#endif
-           break;
-         case JCS_CMYK:
-         case JCS_YCCK:
-diff --git image/decoders/nsPNGDecoder.cpp image/decoders/nsPNGDecoder.cpp
-index 647ff094aaad..2c4bab58b15b 100644
---- image/decoders/nsPNGDecoder.cpp
-+++ image/decoders/nsPNGDecoder.cpp
-@@ -400,7 +400,7 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator,
-                                    IResumable* aOnResume) {
-   MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
- 
--  return mLexer.Lex(aIterator, aOnResume,
-+  LexerResult res = mLexer.Lex(aIterator, aOnResume,
-                     [this](State aState, const char* aData, size_t aLength) {
-                       switch (aState) {
-                         case State::PNG_DATA:
-@@ -410,6 +410,14 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator,
-                       }
-                       MOZ_CRASH("Unknown State");
-                     });
-+
-+#if MOZ_BIG_ENDIAN()
-+  if(res.is<TerminalState>() && res.as<TerminalState>() == TerminalState::SUCCESS) {
-+      NativeEndian::swapToLittleEndianInPlace<uint32_t>((uint32_t*)(mImageData), mImageDataLength / 4);
-+  }
-+#endif
-+
-+  return res;
- }
- 
- LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
-diff --git image/decoders/nsWebPDecoder.cpp image/decoders/nsWebPDecoder.cpp
-index 2496ea2fe2f4..86852dcd3e14 100644
---- image/decoders/nsWebPDecoder.cpp
-+++ image/decoders/nsWebPDecoder.cpp
-@@ -253,7 +253,12 @@ nsresult nsWebPDecoder::CreateFrame(const OrientedIntRect& aFrameRect) {
-   // WebP doesn't guarantee that the alpha generated matches the hint in the
-   // header, so we always need to claim the input is BGRA. If the output is
-   // BGRX, swizzling will mask off the alpha channel.
-+#if MOZ_BIG_ENDIAN()
-+  mBuffer.colorspace = MODE_ARGB;
-+  SurfaceFormat inFormat = mFormat;
-+#else
-   SurfaceFormat inFormat = SurfaceFormat::OS_RGBA;
-+#endif
- 
-   SurfacePipeFlags pipeFlags = SurfacePipeFlags();
-   if (mFormat == SurfaceFormat::OS_RGBA &&
diff --git a/mail/thunderbird/files/patch-bug1716707 b/mail/thunderbird/files/patch-bug1716707
deleted file mode 100644
index 33ff73450b73..000000000000
--- a/mail/thunderbird/files/patch-bug1716707
+++ /dev/null
@@ -1,56 +0,0 @@
-commit ce7a2f400d4f599c72e32e2635fee7ea94c0848c
-Author: Christoph Moench-Tegeder <cmt@burggraben.net>
-Date:   Wed Apr 13 14:44:46 2022 +0200
-
-    big-endian color fixes, but without breaking little-endian
-    
-    as le is what most people actually use
-
-diff --git gfx/webrender_bindings/RenderCompositorSWGL.cpp gfx/webrender_bindings/RenderCompositorSWGL.cpp
-index dbf137c849ee..243a01ff9cf3 100644
---- gfx/webrender_bindings/RenderCompositorSWGL.cpp
-+++ gfx/webrender_bindings/RenderCompositorSWGL.cpp
-@@ -7,6 +7,7 @@
- #include "RenderCompositorSWGL.h"
- 
- #include "mozilla/gfx/Logging.h"
-+#include "mozilla/gfx/Swizzle.h"
- #include "mozilla/widget/CompositorWidget.h"
- 
- #ifdef MOZ_WIDGET_GTK
-@@ -235,6 +236,13 @@ void RenderCompositorSWGL::CommitMappedBuffer(bool aDirty) {
-   }
-   mDT->Flush();
- 
-+#if MOZ_BIG_ENDIAN()
-+  // One swizzle to rule them all.
-+  gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8,
-+                   mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8,
-+                   mDT->GetSize());
-+#endif
-+
-   // Done with the DT. Hand it back to the widget and clear out any trace of it.
-   mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion);
-   mDirtyRegion.SetEmpty();
-diff --git image/imgFrame.cpp image/imgFrame.cpp
-index e58c3dd5b2d4..c1e7e77c362b 100644
---- image/imgFrame.cpp
-+++ image/imgFrame.cpp
-@@ -372,6 +372,17 @@ nsresult imgFrame::InitWithDrawable(gfxDrawable* aDrawable,
-     return NS_ERROR_OUT_OF_MEMORY;
-   }
- 
-+#if MOZ_BIG_ENDIAN()
-+  if (aBackend == gfx::BackendType::SKIA && canUseDataSurface) {
-+    // SKIA is lying about what format it returns on big endian
-+    for (int ii=0; ii < mRawSurface->GetSize().Height()*mRawSurface->Stride() / 4; ++ii) {
-+      uint32_t *vals = (uint32_t*)(mRawSurface->GetData());
-+      uint32_t val = ((vals[ii] << 8) & 0xFF00FF00 ) | ((vals[ii] >> 8) & 0xFF00FF );
-+      vals[ii] = (val << 16) | (val >> 16);
-+    }
-+  }
-+#endif
-+
-   if (!canUseDataSurface) {
-     // We used an offscreen surface, which is an "optimized" surface from
-     // imgFrame's perspective.
diff --git a/mail/thunderbird/files/patch-hal_moz.build b/mail/thunderbird/files/patch-hal_moz.build
new file mode 100644
index 000000000000..1c3eb3fa2853
--- /dev/null
+++ b/mail/thunderbird/files/patch-hal_moz.build
@@ -0,0 +1,18 @@
+commit b4a1f15edc3ebc2b68d2aae22bb59e2ce779cce7
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    try to enable gamepad interface on FreeBSD
+
+diff --git hal/moz.build hal/moz.build
+index bb486ec1e411..60e44128840f 100644
+--- hal/moz.build
++++ hal/moz.build
+@@ -19,7 +19,7 @@ EXPORTS.mozilla += [
+     "HalWakeLockInformation.h",
+ ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "FreeBSD":
+     EXPORTS.mozilla += [
+         "linux/UdevLib.h",
+     ]
diff --git a/mail/thunderbird/files/patch-languageid-de-constexpr-ify b/mail/thunderbird/files/patch-languageid-de-constexpr-ify
new file mode 100644
index 000000000000..1c2a522f5bf5
--- /dev/null
+++ b/mail/thunderbird/files/patch-languageid-de-constexpr-ify
@@ -0,0 +1,138 @@
+commit 87f49da7a84ed9bbce4b8ef263d85b9bd5c42eac
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    Partially de-constexpr'ify LanguageId code
+    
+    This is to deal with our (FreeBSD) libc++, where in some cases
+    std:pair<> is not a "literal type" (suitable for constexpr), even
+    if the same std:pair<> is just fine on all other relevant systems.
+    
+    This removes just enough constexpr annotations to make the code
+    compile.
+    
+    Sample compiler error message:
+    
+    /wrkdirs/usr/ports/www/firefox/work/firefox-151.0/js/src/util/LanguageId.h:234:66: error: constexpr function's return type 'mozilla::Maybe<std::pair<LanguageId>
+      234 |   static constexpr mozilla::Maybe<std::pair<LanguageId, size_t>> from(
+          |                                                                  ^
+    /wrkdirs/usr/ports/www/firefox/work/.build/dist/include/mozilla/Maybe.h:367:7: note: 'Maybe<std::pair<js::LanguageId, unsigned long>>' is not literal because i>
+      367 |     : private detail::MaybeStorage<T>,
+          |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+diff --git js/src/builtin/intl/LocaleNegotiation.cpp js/src/builtin/intl/LocaleNegotiation.cpp
+index 0aff7274eda1..5c25e53b8ea1 100644
+--- js/src/builtin/intl/LocaleNegotiation.cpp
++++ js/src/builtin/intl/LocaleNegotiation.cpp
+@@ -1124,13 +1124,13 @@ struct OldStyleLanguageTagMapping {
+   LanguageId oldStyle;
+   LanguageId modernStyle;
+ 
+-  consteval OldStyleLanguageTagMapping(std::string_view oldStyle,
++  OldStyleLanguageTagMapping(std::string_view oldStyle,
+                                        std::string_view modernStyle)
+       : oldStyle(LanguageId::fromValidBcp49(oldStyle)),
+         modernStyle(LanguageId::fromValidBcp49(modernStyle)) {}
+ };
+ 
+-static constexpr OldStyleLanguageTagMapping oldStyleLanguageTagMappings[] = {
++static OldStyleLanguageTagMapping oldStyleLanguageTagMappings[] = {
+     {"pa-PK", "pa-Arab-PK"}, {"zh-CN", "zh-Hans-CN"}, {"zh-HK", "zh-Hant-HK"},
+     {"zh-SG", "zh-Hans-SG"}, {"zh-TW", "zh-Hant-TW"},
+ };
+diff --git js/src/builtin/intl/SharedIntlData.cpp js/src/builtin/intl/SharedIntlData.cpp
+index 581c9d1e6ebd..9dd3a50acb1c 100644
+--- js/src/builtin/intl/SharedIntlData.cpp
++++ js/src/builtin/intl/SharedIntlData.cpp
+@@ -431,11 +431,11 @@ bool js::intl::SharedIntlData::getAvailableLocales(
+   // directly support it (but does support it through fallback, e.g. supporting
+   // "en-GB" indirectly using "en" support).
+   {
+-    static constexpr auto lastDitch = LastDitchLocale();
+-    static_assert(std::string_view{lastDitch.toString()} == "en-GB");
++    static auto lastDitch = LastDitchLocale();
++    // static_assert(std::string_view{lastDitch.toString()} == "en-GB");
+ 
+ #ifdef DEBUG
+-    static constexpr auto lastDitchParent = lastDitch.parentLocale();
++    static auto lastDitchParent = lastDitch.parentLocale();
+     static_assert(std::string_view{lastDitchParent.toString()} == "en");
+ 
+     MOZ_ASSERT(locales.has(lastDitchParent),
+diff --git js/src/util/LanguageId.h js/src/util/LanguageId.h
+index 7c193c3e2e07..bf391ef39717 100644
+--- js/src/util/LanguageId.h
++++ js/src/util/LanguageId.h
+@@ -231,7 +231,7 @@ class LanguageId final {
+ 
+  private:
+   template <char... separators, typename CharT>
+-  static constexpr mozilla::Maybe<std::pair<LanguageId, size_t>> from(
++  static /* constexpr */ mozilla::Maybe<std::pair<LanguageId, size_t>> from(
+       std::basic_string_view<CharT> localeId) {
+     // Return true iff |sv| starts with a subtag of length |len|.
+     auto hasSubtag = [](std::basic_string_view<CharT> sv, size_t len) {
+@@ -313,7 +313,7 @@ class LanguageId final {
+    *
+    * Subtags in ICU and Unicode locale identifiers are separated by "-" or "_".
+    */
+-  static constexpr auto fromId(std::string_view localeId) {
++  static auto fromId(std::string_view localeId) {
+     return from<'-', '_'>(localeId);
+   }
+ 
+@@ -327,7 +327,7 @@ class LanguageId final {
+    *
+    * Subtags in ICU and Unicode locale identifiers are separated by "-" or "_".
+    */
+-  static constexpr auto fromId(mozilla::Span<const char> localeId) {
++  static auto fromId(mozilla::Span<const char> localeId) {
+     return fromId(std::string_view{localeId.data(), localeId.size()});
+   }
+ 
+@@ -341,7 +341,7 @@ class LanguageId final {
+    *
+    * Subtags in BCP 47 locale identifiers are separated by "-".
+    */
+-  static constexpr auto fromBcp49(std::string_view localeId) {
++  static auto fromBcp49(std::string_view localeId) {
+     return from<'-'>(localeId);
+   }
+ 
+@@ -355,7 +355,7 @@ class LanguageId final {
+    *
+    * Subtags in BCP 47 locale identifiers are separated by "-".
+    */
+-  static constexpr auto fromBcp49(std::u16string_view localeId) {
++  static auto fromBcp49(std::u16string_view localeId) {
+     return from<u'-'>(localeId);
+   }
+ 
+@@ -370,7 +370,7 @@ class LanguageId final {
+    * Subtags in BCP 47 locale identifiers are separated by "-".
+    */
+   template <typename CharT>
+-  static constexpr auto fromBcp49(mozilla::Span<const CharT> localeId) {
++  static auto fromBcp49(mozilla::Span<const CharT> localeId) {
+     return fromBcp49(std::basic_string_view{localeId.data(), localeId.size()});
+   }
+ 
+@@ -381,7 +381,7 @@ class LanguageId final {
+    *
+    * Subtags in BCP 47 locale identifiers are separated by "-".
+    */
+-  static consteval auto fromValidBcp49(std::string_view localeId) {
++  static auto fromValidBcp49(std::string_view localeId) {
+     return fromBcp49(localeId)->first;
+   }
+ 
+@@ -408,8 +408,8 @@ class LanguageId final {
+   /**
+    * Return the language identifier for the undetermined locale "und".
+    */
+-  static constexpr auto und() {
+-    constexpr LanguageId locale = fromValidBcp49("und");
++  static auto und() {
++    LanguageId locale = fromValidBcp49("und");
+     return locale;
+   }
+ 
diff --git a/mail/thunderbird/files/patch-libwebrtc-generated b/mail/thunderbird/files/patch-libwebrtc-generated
index 143105cfb3b5..26f943cfe3dc 100644
--- a/mail/thunderbird/files/patch-libwebrtc-generated
+++ b/mail/thunderbird/files/patch-libwebrtc-generated
@@ -1,19 +1,20 @@
-commit a4fe5e199d4349894a54417391eb398ab3a5ac13
+commit 17095363b03be8360b9f990cc38a0e0d3cb7f9d6
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
-    regenerate FreeBSD libwebrtc patch for gecko 150
+    regenerate FreeBSD libwebrtc patch for gecko 151
 
 diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-index a4922c66929f..210a9a828897 100644
+index 2060d5597a7c..643ec6ab666e 100644
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -29,7 +30,7 @@ index a4922c66929f..210a9a828897 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -117,7 +118,7 @@ index a4922c66929f..210a9a828897 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -204,16 +205,17 @@ index a4922c66929f..210a9a828897 100644
  
  Library("resource_adaptation_api_gn")
 diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index f1102c30059a..d2ebee0ec710 100644
+index 0bbf80a6695a..ddce5f754491 100644
 --- third_party/libwebrtc/api/array_view_gn/moz.build
 +++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -229,7 +231,7 @@ index f1102c30059a..d2ebee0ec710 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -248,10 +250,6 @@ index f1102c30059a..d2ebee0ec710 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -317,7 +315,7 @@ index f1102c30059a..d2ebee0ec710 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -343,7 +341,7 @@ index f1102c30059a..d2ebee0ec710 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -385,16 +383,17 @@ index f1102c30059a..d2ebee0ec710 100644
 -
  Library("array_view_gn")
 diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-index b4939a5514c1..1c688af7efa3 100644
+index 49c53fe1c5b5..d51f92b1c6c2 100644
 --- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
 +++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -410,7 +409,7 @@ index b4939a5514c1..1c688af7efa3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -506,7 +505,7 @@ index b4939a5514c1..1c688af7efa3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -532,7 +531,7 @@ index b4939a5514c1..1c688af7efa3 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -574,16 +573,17 @@ index b4939a5514c1..1c688af7efa3 100644
 -
  Library("async_dns_resolver_gn")
 diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index 4ae595bcba6d..3e9fbb0332ff 100644
+index 7d4403b9f470..3fae035ac130 100644
 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -599,7 +599,7 @@ index 4ae595bcba6d..3e9fbb0332ff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -687,7 +687,7 @@ index 4ae595bcba6d..3e9fbb0332ff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -774,10 +774,10 @@ index 4ae595bcba6d..3e9fbb0332ff 100644
  
  Library("aec3_config_gn")
 diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index 6f88ea8491e1..9fe5afa4dd03 100644
+index f2410c579108..9f40b3130715 100644
 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -785,6 +785,7 @@ index 6f88ea8491e1..9fe5afa4dd03 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -800,7 +801,7 @@ index 6f88ea8491e1..9fe5afa4dd03 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -895,7 +896,7 @@ index 6f88ea8491e1..9fe5afa4dd03 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -982,16 +983,17 @@ index 6f88ea8491e1..9fe5afa4dd03 100644
  
  Library("aec3_factory_gn")
 diff --git third_party/libwebrtc/api/audio/audio_device_gn/moz.build third_party/libwebrtc/api/audio/audio_device_gn/moz.build
-index 8e0dddd4c23e..1812ab6bedf8 100644
+index 689735dfd716..c2caf57806a2 100644
 --- third_party/libwebrtc/api/audio/audio_device_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_device_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -1007,7 +1009,7 @@ index 8e0dddd4c23e..1812ab6bedf8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1095,7 +1097,7 @@ index 8e0dddd4c23e..1812ab6bedf8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1121,7 +1123,7 @@ index 8e0dddd4c23e..1812ab6bedf8 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1163,16 +1165,17 @@ index 8e0dddd4c23e..1812ab6bedf8 100644
 -
  Library("audio_device_gn")
 diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index fb633e3930e2..9ba8edf80c44 100644
+index 47bef217f34a..a667f5680b09 100644
 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -1188,7 +1191,7 @@ index fb633e3930e2..9ba8edf80c44 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1283,7 +1286,7 @@ index fb633e3930e2..9ba8edf80c44 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1370,16 +1373,17 @@ index fb633e3930e2..9ba8edf80c44 100644
  
  Library("audio_frame_api_gn")
 diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index 0088f18ad2dc..8228190616ec 100644
+index 75e25f0f79b9..a6a6475a8dde 100644
 --- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -1395,7 +1399,7 @@ index 0088f18ad2dc..8228190616ec 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1479,7 +1483,7 @@ index 0088f18ad2dc..8228190616ec 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1505,7 +1509,7 @@ index 0088f18ad2dc..8228190616ec 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1547,16 +1551,17 @@ index 0088f18ad2dc..8228190616ec 100644
 -
  Library("audio_frame_processor_gn")
 diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 28b98ffce7a9..ac544c619786 100644
+index d364656f24b7..db4addb9a16b 100644
 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -1572,7 +1577,7 @@ index 28b98ffce7a9..ac544c619786 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1667,7 +1672,7 @@ index 28b98ffce7a9..ac544c619786 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1693,7 +1698,7 @@ index 28b98ffce7a9..ac544c619786 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -1735,16 +1740,17 @@ index 28b98ffce7a9..ac544c619786 100644
 -
  Library("audio_mixer_api_gn")
 diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-index cdd225e6797e..bc5318d09ca8 100644
+index ecf7bc9ff780..27e1beddf05b 100644
 --- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -1760,7 +1766,7 @@ index cdd225e6797e..bc5318d09ca8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1855,7 +1861,7 @@ index cdd225e6797e..bc5318d09ca8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -1942,16 +1948,17 @@ index cdd225e6797e..bc5318d09ca8 100644
  
  Library("audio_processing_gn")
 diff --git third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-index 5e452f4c3ed0..fcb573b9c8c6 100644
+index 4a58ec994f57..0be09edb1e1d 100644
 --- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -1967,7 +1974,7 @@ index 5e452f4c3ed0..fcb573b9c8c6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2051,7 +2058,7 @@ index 5e452f4c3ed0..fcb573b9c8c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2138,10 +2145,10 @@ index 5e452f4c3ed0..fcb573b9c8c6 100644
  
  Library("audio_processing_statistics_gn")
 diff --git third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-index 23730cb4c781..b3c9022f62d2 100644
+index 30a844e48445..eae022665150 100644
 --- third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
 +++ third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -2149,6 +2156,7 @@ index 23730cb4c781..b3c9022f62d2 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -2164,7 +2172,7 @@ index 23730cb4c781..b3c9022f62d2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2259,7 +2267,7 @@ index 23730cb4c781..b3c9022f62d2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2346,16 +2354,17 @@ index 23730cb4c781..b3c9022f62d2 100644
  
  Library("builtin_audio_processing_builder_gn")
 diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 003dd55e4b8c..a7421daf3fc4 100644
+index 08b4401c5e8b..fea70be82808 100644
 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -2371,7 +2380,7 @@ index 003dd55e4b8c..a7421daf3fc4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2466,7 +2475,7 @@ index 003dd55e4b8c..a7421daf3fc4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2492,7 +2501,7 @@ index 003dd55e4b8c..a7421daf3fc4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -2534,16 +2543,17 @@ index 003dd55e4b8c..a7421daf3fc4 100644
 -
  Library("echo_control_gn")
 diff --git third_party/libwebrtc/api/audio/neural_residual_echo_estimator_api_gn/moz.build third_party/libwebrtc/api/audio/neural_residual_echo_estimator_api_gn/moz.build
-index 8de81071573a..822648b5f889 100644
+index 3f62db23e546..18442ad6cea6 100644
 --- third_party/libwebrtc/api/audio/neural_residual_echo_estimator_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/neural_residual_echo_estimator_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -2559,7 +2569,7 @@ index 8de81071573a..822648b5f889 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2647,7 +2657,7 @@ index 8de81071573a..822648b5f889 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2673,7 +2683,7 @@ index 8de81071573a..822648b5f889 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -2715,16 +2725,17 @@ index 8de81071573a..822648b5f889 100644
 -
  Library("neural_residual_echo_estimator_api_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index 6877f2e2caba..0a94c771f597 100644
+index 69145ce4726a..716411cfd1a5 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -2740,7 +2751,7 @@ index 6877f2e2caba..0a94c771f597 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2835,7 +2846,7 @@ index 6877f2e2caba..0a94c771f597 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -2922,16 +2933,17 @@ index 6877f2e2caba..0a94c771f597 100644
  
  Library("audio_decoder_L16_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index 107e5544da1b..44b16b46dd4b 100644
+index f64811e0248f..29125da9e946 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -2947,7 +2959,7 @@ index 107e5544da1b..44b16b46dd4b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3042,7 +3054,7 @@ index 107e5544da1b..44b16b46dd4b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3129,16 +3141,17 @@ index 107e5544da1b..44b16b46dd4b 100644
  
  Library("audio_encoder_L16_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 2fcb098ef1df..624eb7a63ed3 100644
+index d73085a74ca0..f70750a258de 100644
 --- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -3154,7 +3167,7 @@ index 2fcb098ef1df..624eb7a63ed3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3249,7 +3262,7 @@ index 2fcb098ef1df..624eb7a63ed3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3336,16 +3349,17 @@ index 2fcb098ef1df..624eb7a63ed3 100644
  
  Library("audio_codecs_api_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index 2dfec6bd8ace..2c87cb06e541 100644
+index eccd2393cb40..da2090513221 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -3362,7 +3376,7 @@ index 2dfec6bd8ace..2c87cb06e541 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3457,7 +3471,7 @@ index 2dfec6bd8ace..2c87cb06e541 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3544,16 +3558,17 @@ index 2dfec6bd8ace..2c87cb06e541 100644
  
  Library("builtin_audio_decoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index 559645de2de6..8af7c3467f2b 100644
+index 1364bb4a47ad..4f0cd8b699a6 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -3570,7 +3585,7 @@ index 559645de2de6..8af7c3467f2b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3665,7 +3680,7 @@ index 559645de2de6..8af7c3467f2b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3752,16 +3767,17 @@ index 559645de2de6..8af7c3467f2b 100644
  
  Library("builtin_audio_encoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index ad147399181d..b24120ede667 100644
+index 21cc5d768839..c98066c812a3 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -3777,7 +3793,7 @@ index ad147399181d..b24120ede667 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3872,7 +3888,7 @@ index ad147399181d..b24120ede667 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -3959,16 +3975,17 @@ index ad147399181d..b24120ede667 100644
  
  Library("audio_decoder_g711_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index 6433c15e39ea..e2eb177fab83 100644
+index cc8a3d132ed3..92e7158725f0 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -3984,7 +4001,7 @@ index 6433c15e39ea..e2eb177fab83 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4079,7 +4096,7 @@ index 6433c15e39ea..e2eb177fab83 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4166,16 +4183,17 @@ index 6433c15e39ea..e2eb177fab83 100644
  
  Library("audio_encoder_g711_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index e1a1d3c8e9d4..77c49f946aeb 100644
+index a6cb370b8d59..516eb6d242a7 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -4191,7 +4209,7 @@ index e1a1d3c8e9d4..77c49f946aeb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4286,7 +4304,7 @@ index e1a1d3c8e9d4..77c49f946aeb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4373,16 +4391,17 @@ index e1a1d3c8e9d4..77c49f946aeb 100644
  
  Library("audio_decoder_g722_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 7254662163f2..3046572aba75 100644
+index 1d7de1636708..1dd246e914f8 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -4398,7 +4417,7 @@ index 7254662163f2..3046572aba75 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4493,7 +4512,7 @@ index 7254662163f2..3046572aba75 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4519,7 +4538,7 @@ index 7254662163f2..3046572aba75 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -4561,16 +4580,17 @@ index 7254662163f2..3046572aba75 100644
 -
  Library("audio_encoder_g722_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index 7d9475c9e15e..d35fe3533ed8 100644
+index 623ca9c714d5..ab9575507585 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -4586,7 +4606,7 @@ index 7d9475c9e15e..d35fe3533ed8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4681,7 +4701,7 @@ index 7d9475c9e15e..d35fe3533ed8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4768,16 +4788,17 @@ index 7d9475c9e15e..d35fe3533ed8 100644
  
  Library("audio_encoder_g722_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index 8d5b597b98cd..3c9f2c3b50cb 100644
+index 7874b5b1199f..952f3aa2bb3b 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -4793,7 +4814,7 @@ index 8d5b597b98cd..3c9f2c3b50cb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4888,7 +4909,7 @@ index 8d5b597b98cd..3c9f2c3b50cb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -4975,16 +4996,17 @@ index 8d5b597b98cd..3c9f2c3b50cb 100644
  
  Library("audio_decoder_multiopus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index 35c1f3b1d7dc..eeb1e3e24104 100644
+index 361718958bc9..7e91efc5ed29 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -5000,7 +5022,7 @@ index 35c1f3b1d7dc..eeb1e3e24104 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5095,7 +5117,7 @@ index 35c1f3b1d7dc..eeb1e3e24104 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5121,7 +5143,7 @@ index 35c1f3b1d7dc..eeb1e3e24104 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -5163,16 +5185,17 @@ index 35c1f3b1d7dc..eeb1e3e24104 100644
 -
  Library("audio_decoder_opus_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index cf0f5ac728d5..21a0df0059f5 100644
+index dd0659cba348..3e5a0909d0ac 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -5188,7 +5211,7 @@ index cf0f5ac728d5..21a0df0059f5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5283,7 +5306,7 @@ index cf0f5ac728d5..21a0df0059f5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5370,16 +5393,17 @@ index cf0f5ac728d5..21a0df0059f5 100644
  
  Library("audio_decoder_opus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index 2a92d825dff0..1acf41cea4cc 100644
+index b2e8a02739e0..ad7c8bd5e504 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -5395,7 +5419,7 @@ index 2a92d825dff0..1acf41cea4cc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5490,7 +5514,7 @@ index 2a92d825dff0..1acf41cea4cc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5577,19 +5601,20 @@ index 2a92d825dff0..1acf41cea4cc 100644
  
  Library("audio_encoder_multiopus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index 72567d1deba1..9d44290fa3c8 100644
+index 2c29ff9b1090..fd3ec3705c0d 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
  DEFINES["WEBRTC_OPUS_VARIABLE_COMPLEXITY"] = "0"
@@ -5603,7 +5628,7 @@ index 72567d1deba1..9d44290fa3c8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,93 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5698,7 +5723,7 @@ index 72567d1deba1..9d44290fa3c8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5785,16 +5810,17 @@ index 72567d1deba1..9d44290fa3c8 100644
  
  Library("audio_encoder_opus_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index c38bcbc671fc..0bff614d13c4 100644
+index 37de69236176..25d6958ead45 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -5810,7 +5836,7 @@ index c38bcbc671fc..0bff614d13c4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5905,7 +5931,7 @@ index c38bcbc671fc..0bff614d13c4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -5992,16 +6018,17 @@ index c38bcbc671fc..0bff614d13c4 100644
  
  Library("audio_encoder_opus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-index 22027800ff54..889064300cef 100644
+index 54d69d1dd616..891b009d67e3 100644
 --- third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -6017,7 +6044,7 @@ index 22027800ff54..889064300cef 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6112,7 +6139,7 @@ index 22027800ff54..889064300cef 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6199,16 +6226,17 @@ index 22027800ff54..889064300cef 100644
  
  Library("opus_audio_decoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index c23c271b22e1..7132a5211aa1 100644
+index 0ffe0dab9e73..e0c0571237ce 100644
 --- third_party/libwebrtc/api/audio_options_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -6224,7 +6252,7 @@ index c23c271b22e1..7132a5211aa1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6312,7 +6340,7 @@ index c23c271b22e1..7132a5211aa1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6399,16 +6427,17 @@ index c23c271b22e1..7132a5211aa1 100644
  
  Library("audio_options_api_gn")
 diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index e554b81f633f..8999ae4c13a9 100644
+index 58981f0954e9..0dea2b834ace 100644
 --- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -6424,7 +6453,7 @@ index e554b81f633f..8999ae4c13a9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6512,7 +6541,7 @@ index e554b81f633f..8999ae4c13a9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6538,7 +6567,7 @@ index e554b81f633f..8999ae4c13a9 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -6580,16 +6609,17 @@ index e554b81f633f..8999ae4c13a9 100644
 -
  Library("bitrate_allocation_gn")
 diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index 2d2e381b8423..bd8e01b40700 100644
+index 6a5e7f057123..962378b8c697 100644
 --- third_party/libwebrtc/api/call_api_gn/moz.build
 +++ third_party/libwebrtc/api/call_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -6605,7 +6635,7 @@ index 2d2e381b8423..bd8e01b40700 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6689,7 +6719,7 @@ index 2d2e381b8423..bd8e01b40700 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6715,7 +6745,7 @@ index 2d2e381b8423..bd8e01b40700 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -6757,16 +6787,17 @@ index 2d2e381b8423..bd8e01b40700 100644
 -
  Library("call_api_gn")
 diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index 69f8f6d11554..cf3f00cfd583 100644
+index 64d18eda3d58..9fe6e00d6c7b 100644
 --- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -6782,7 +6813,7 @@ index 69f8f6d11554..cf3f00cfd583 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6877,7 +6908,7 @@ index 69f8f6d11554..cf3f00cfd583 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -6903,7 +6934,7 @@ index 69f8f6d11554..cf3f00cfd583 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -6945,16 +6976,17 @@ index 69f8f6d11554..cf3f00cfd583 100644
 -
  Library("frame_decryptor_interface_gn")
 diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index 9a0878536bcf..a4f99ff8357a 100644
+index 3260f6c6345d..9d9deac6ffe7 100644
 --- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -6970,7 +7002,7 @@ index 9a0878536bcf..a4f99ff8357a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7065,7 +7097,7 @@ index 9a0878536bcf..a4f99ff8357a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7091,7 +7123,7 @@ index 9a0878536bcf..a4f99ff8357a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -7133,16 +7165,17 @@ index 9a0878536bcf..a4f99ff8357a 100644
 -
  Library("frame_encryptor_interface_gn")
 diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index 071165211246..77d8eb74d010 100644
+index f02798ffaba3..66dd512d8263 100644
 --- third_party/libwebrtc/api/crypto/options_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/options_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -7158,7 +7191,7 @@ index 071165211246..77d8eb74d010 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7246,7 +7279,7 @@ index 071165211246..77d8eb74d010 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7333,16 +7366,17 @@ index 071165211246..77d8eb74d010 100644
  
  Library("options_gn")
 diff --git third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
-index 95b07bc6261f..4c2ff30dab40 100644
+index 0c91aaa67d0c..5712e8195c9f 100644
 --- third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
 +++ third_party/libwebrtc/api/environment/deprecated_global_field_trials_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -7358,7 +7392,7 @@ index 95b07bc6261f..4c2ff30dab40 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7453,7 +7487,7 @@ index 95b07bc6261f..4c2ff30dab40 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7540,16 +7574,17 @@ index 95b07bc6261f..4c2ff30dab40 100644
  
  Library("deprecated_global_field_trials_gn")
 diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-index ed3d1c43a856..fdd57e9f22b3 100644
+index 37091ec4b18f..ccece70d1526 100644
 --- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
 +++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -7565,7 +7600,7 @@ index ed3d1c43a856..fdd57e9f22b3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7660,7 +7695,7 @@ index ed3d1c43a856..fdd57e9f22b3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7747,16 +7782,17 @@ index ed3d1c43a856..fdd57e9f22b3 100644
  
  Library("environment_factory_gn")
 diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build third_party/libwebrtc/api/environment/environment_gn/moz.build
-index 623399700cb5..631f307ea954 100644
+index bc6655ed6409..6508431472e4 100644
 --- third_party/libwebrtc/api/environment/environment_gn/moz.build
 +++ third_party/libwebrtc/api/environment/environment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -7772,7 +7808,7 @@ index 623399700cb5..631f307ea954 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7867,7 +7903,7 @@ index 623399700cb5..631f307ea954 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -7893,7 +7929,7 @@ index 623399700cb5..631f307ea954 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -7935,16 +7971,17 @@ index 623399700cb5..631f307ea954 100644
 -
  Library("environment_gn")
 diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index 26322221e75c..c2960773bae5 100644
+index 757d55a51df5..346b236d1bba 100644
 --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -7960,7 +7997,7 @@ index 26322221e75c..c2960773bae5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8055,7 +8092,7 @@ index 26322221e75c..c2960773bae5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8081,7 +8118,7 @@ index 26322221e75c..c2960773bae5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -8123,16 +8160,17 @@ index 26322221e75c..c2960773bae5 100644
 -
  Library("fec_controller_api_gn")
 diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-index 834d5f8de566..382075b68488 100644
+index 975a91f3e78e..36ab4bca6297 100644
 --- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -8148,7 +8186,7 @@ index 834d5f8de566..382075b68488 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8243,7 +8281,7 @@ index 834d5f8de566..382075b68488 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8330,16 +8368,17 @@ index 834d5f8de566..382075b68488 100644
  
  Library("field_trials_registry_gn")
 diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index b2598d5e27a6..59ff862b5aff 100644
+index 02b38330e521..07dd49ed9bb6 100644
 --- third_party/libwebrtc/api/field_trials_view_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -8355,7 +8394,7 @@ index b2598d5e27a6..59ff862b5aff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8443,7 +8482,7 @@ index b2598d5e27a6..59ff862b5aff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8469,7 +8508,7 @@ index b2598d5e27a6..59ff862b5aff 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -8511,16 +8550,17 @@ index b2598d5e27a6..59ff862b5aff 100644
 -
  Library("field_trials_view_gn")
 diff --git third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-index e5a1b83d2822..a437cb5392b2 100644
+index 1b180f02953d..edf25d2bb3f8 100644
 --- third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
 +++ third_party/libwebrtc/api/frame_transformer_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -8536,7 +8576,7 @@ index e5a1b83d2822..a437cb5392b2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8632,7 +8672,7 @@ index e5a1b83d2822..a437cb5392b2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8719,16 +8759,17 @@ index e5a1b83d2822..a437cb5392b2 100644
  
  Library("frame_transformer_factory_gn")
 diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index ba884e273d4b..b85c50f05417 100644
+index d3197a27b332..228d8df3fe02 100644
 --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
 +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -8744,7 +8785,7 @@ index ba884e273d4b..b85c50f05417 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8839,7 +8880,7 @@ index ba884e273d4b..b85c50f05417 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -8926,16 +8967,17 @@ index ba884e273d4b..b85c50f05417 100644
  
  Library("frame_transformer_interface_gn")
 diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index 37e1e4a3cb61..22e59d619687 100644
+index b5c55b973d29..1bfaae50c76f 100644
 --- third_party/libwebrtc/api/function_view_gn/moz.build
 +++ third_party/libwebrtc/api/function_view_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -8951,7 +8993,7 @@ index 37e1e4a3cb61..22e59d619687 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9039,7 +9081,7 @@ index 37e1e4a3cb61..22e59d619687 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9065,7 +9107,7 @@ index 37e1e4a3cb61..22e59d619687 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9107,16 +9149,17 @@ index 37e1e4a3cb61..22e59d619687 100644
 -
  Library("function_view_gn")
 diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index 031193bbf246..420fe76c9250 100644
+index dd4494c2e533..49d182e68be6 100644
 --- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 +++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -9132,7 +9175,7 @@ index 031193bbf246..420fe76c9250 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9216,7 +9259,7 @@ index 031193bbf246..420fe76c9250 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9242,7 +9285,7 @@ index 031193bbf246..420fe76c9250 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9283,194 +9326,18 @@ index 031193bbf246..420fe76c9250 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("jingle_logging_api_gn")
-diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-index 570cfe3e0f46..0cf698831744 100644
---- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-+++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "xul"
- 
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
--    DEFINES["__STD_C"] = True
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["WEBRTC_HAS_NEON"] = True
-     DEFINES["__ARM_NEON__"] = "1"
- 
--if CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
- Library("jingle_peerconnection_api_gn")
 diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index bb48aa293591..0df5683760a9 100644
+index 5b2d7a8ee436..139137d0a292 100644
 --- third_party/libwebrtc/api/location_gn/moz.build
 +++ third_party/libwebrtc/api/location_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -9486,7 +9353,7 @@ index bb48aa293591..0df5683760a9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9570,7 +9437,7 @@ index bb48aa293591..0df5683760a9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9596,7 +9463,7 @@ index bb48aa293591..0df5683760a9 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9638,16 +9505,17 @@ index bb48aa293591..0df5683760a9 100644
 -
  Library("location_gn")
 diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index e8c3318f0297..e255232b7c0f 100644
+index bd6da35be447..dbed6cd91d1f 100644
 --- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 +++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -9663,7 +9531,7 @@ index e8c3318f0297..e255232b7c0f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9747,7 +9615,7 @@ index e8c3318f0297..e255232b7c0f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -9773,7 +9641,7 @@ index e8c3318f0297..e255232b7c0f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -9815,16 +9683,17 @@ index e8c3318f0297..e255232b7c0f 100644
 -
  Library("make_ref_counted_gn")
 diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index d2036a2a6aaa..84b69c959ded 100644
+index a9bb935bcffe..a58fec2d4900 100644
 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -9840,7 +9709,7 @@ index d2036a2a6aaa..84b69c959ded 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9935,7 +9804,7 @@ index d2036a2a6aaa..84b69c959ded 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10022,16 +9891,17 @@ index d2036a2a6aaa..84b69c959ded 100644
  
  Library("media_stream_interface_gn")
 diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index 8fc12ea95fda..4dd6b378c5c6 100644
+index 5011c068c3d1..f65c5739d78c 100644
 --- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
 +++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -10047,7 +9917,7 @@ index 8fc12ea95fda..4dd6b378c5c6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10135,7 +10005,7 @@ index 8fc12ea95fda..4dd6b378c5c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10161,7 +10031,7 @@ index 8fc12ea95fda..4dd6b378c5c6 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10203,16 +10073,17 @@ index 8fc12ea95fda..4dd6b378c5c6 100644
 -
  Library("metronome_gn")
 diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index 72fc97e1e4d0..578be91eda8a 100644
+index 882e94d3201c..a3d2d5d756f6 100644
 --- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -10228,7 +10099,7 @@ index 72fc97e1e4d0..578be91eda8a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10323,7 +10194,7 @@ index 72fc97e1e4d0..578be91eda8a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10410,16 +10281,17 @@ index 72fc97e1e4d0..578be91eda8a 100644
  
  Library("default_neteq_controller_factory_gn")
 diff --git third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-index 1fac43ca8133..3822f3c47cf0 100644
+index 0ab6795dd97d..2944b668d6e8 100644
 --- third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -10435,7 +10307,7 @@ index 1fac43ca8133..3822f3c47cf0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10530,7 +10402,7 @@ index 1fac43ca8133..3822f3c47cf0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10617,16 +10489,17 @@ index 1fac43ca8133..3822f3c47cf0 100644
  
  Library("default_neteq_factory_gn")
 diff --git third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
-index 3063e1118a14..1cef703f3744 100644
+index 3751cd638cf1..c145915fa20b 100644
 --- third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/delay_manager_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -10642,7 +10515,7 @@ index 3063e1118a14..1cef703f3744 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10737,7 +10610,7 @@ index 3063e1118a14..1cef703f3744 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -10763,7 +10636,7 @@ index 3063e1118a14..1cef703f3744 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10805,16 +10678,17 @@ index 3063e1118a14..1cef703f3744 100644
 -
  Library("delay_manager_api_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index 1afebecfa713..e6cae2901777 100644
+index 01017fe90069..43080532d098 100644
 --- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -10830,7 +10704,7 @@ index 1afebecfa713..e6cae2901777 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10925,7 +10799,7 @@ index 1afebecfa713..e6cae2901777 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11012,16 +10886,17 @@ index 1afebecfa713..e6cae2901777 100644
  
  Library("neteq_api_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index 360aeb8c1888..b3725c959c68 100644
+index 80d4674a80cb..0fa0de1fb3da 100644
 --- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -11037,7 +10912,7 @@ index 360aeb8c1888..b3725c959c68 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11132,7 +11007,7 @@ index 360aeb8c1888..b3725c959c68 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11158,7 +11033,7 @@ index 360aeb8c1888..b3725c959c68 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11200,16 +11075,17 @@ index 360aeb8c1888..b3725c959c68 100644
 -
  Library("neteq_controller_api_gn")
 diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index ce574f703e85..f63d71206fa2 100644
+index 006f52e45d49..8cf04d6a91bd 100644
 --- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -11225,7 +11101,7 @@ index ce574f703e85..f63d71206fa2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11313,7 +11189,7 @@ index ce574f703e85..f63d71206fa2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11400,16 +11276,17 @@ index ce574f703e85..f63d71206fa2 100644
  
  Library("tick_timer_gn")
 diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index dfdf9c995949..c5307e1d122c 100644
+index 495ebb45c468..94272328ea2c 100644
 --- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 +++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -11425,7 +11302,7 @@ index dfdf9c995949..c5307e1d122c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11509,7 +11386,7 @@ index dfdf9c995949..c5307e1d122c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11535,7 +11412,7 @@ index dfdf9c995949..c5307e1d122c 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11576,17 +11453,196 @@ index dfdf9c995949..c5307e1d122c 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("network_state_predictor_api_gn")
+diff --git third_party/libwebrtc/api/payload_type_gn/moz.build third_party/libwebrtc/api/payload_type_gn/moz.build
+index bb81df1d03cb..ae039eb49b5a 100644
+--- third_party/libwebrtc/api/payload_type_gn/moz.build
++++ third_party/libwebrtc/api/payload_type_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+-    DEFINES["__STD_C"] = True
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
+     DEFINES["__ARM_NEON__"] = "1"
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("payload_type_gn")
 diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index bf2fa1665e7e..1048dc991346 100644
+index 495d28a32f04..da3ef6ccd37f 100644
 --- third_party/libwebrtc/api/priority_gn/moz.build
 +++ third_party/libwebrtc/api/priority_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -11602,7 +11658,7 @@ index bf2fa1665e7e..1048dc991346 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11690,7 +11746,7 @@ index bf2fa1665e7e..1048dc991346 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11777,16 +11833,17 @@ index bf2fa1665e7e..1048dc991346 100644
  
  Library("priority_gn")
 diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build
-index b348930d7ec3..6e1ce2a4baad 100644
+index f074f1b21caa..3e22d0ac4650 100644
 --- third_party/libwebrtc/api/ref_count_gn/moz.build
 +++ third_party/libwebrtc/api/ref_count_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -11802,7 +11859,7 @@ index b348930d7ec3..6e1ce2a4baad 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11886,7 +11943,7 @@ index b348930d7ec3..6e1ce2a4baad 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -11912,7 +11969,7 @@ index b348930d7ec3..6e1ce2a4baad 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11954,16 +12011,17 @@ index b348930d7ec3..6e1ce2a4baad 100644
 -
  Library("ref_count_gn")
 diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 8f218b17aea6..0d0dc0b4711b 100644
+index 9c7cdeead932..892e8767180a 100644
 --- third_party/libwebrtc/api/refcountedbase_gn/moz.build
 +++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -11979,7 +12037,7 @@ index 8f218b17aea6..0d0dc0b4711b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12063,7 +12121,7 @@ index 8f218b17aea6..0d0dc0b4711b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12089,7 +12147,7 @@ index 8f218b17aea6..0d0dc0b4711b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -12131,16 +12189,17 @@ index 8f218b17aea6..0d0dc0b4711b 100644
 -
  Library("refcountedbase_gn")
 diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 8a09b2f6a451..4cd767026bc4 100644
+index f54c71c3bbc4..bdad7f5031fe 100644
 --- third_party/libwebrtc/api/rtc_error_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_error_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -12156,7 +12215,7 @@ index 8a09b2f6a451..4cd767026bc4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12251,7 +12310,7 @@ index 8a09b2f6a451..4cd767026bc4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12338,16 +12397,17 @@ index 8a09b2f6a451..4cd767026bc4 100644
  
  Library("rtc_error_gn")
 diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index 643e3b2729b4..5f87ed663020 100644
+index 0cef03bc3187..1377e3a7fb4b 100644
 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -12363,7 +12423,7 @@ index 643e3b2729b4..5f87ed663020 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12451,7 +12511,7 @@ index 643e3b2729b4..5f87ed663020 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12538,16 +12598,17 @@ index 643e3b2729b4..5f87ed663020 100644
  
  Library("rtc_event_log_gn")
 diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index fb46ff525fa5..4f0061742b36 100644
+index 11a775e82c3d..6486829cd820 100644
 --- third_party/libwebrtc/api/rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -12563,7 +12624,7 @@ index fb46ff525fa5..4f0061742b36 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12658,7 +12719,7 @@ index fb46ff525fa5..4f0061742b36 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12745,16 +12806,17 @@ index fb46ff525fa5..4f0061742b36 100644
  
  Library("rtp_headers_gn")
 diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index 3a7abf97f0ae..462e922c57e9 100644
+index 0ae3507f2cb1..c958898e8793 100644
 --- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -12770,7 +12832,7 @@ index 3a7abf97f0ae..462e922c57e9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12865,7 +12927,7 @@ index 3a7abf97f0ae..462e922c57e9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -12952,16 +13014,17 @@ index 3a7abf97f0ae..462e922c57e9 100644
  
  Library("rtp_packet_info_gn")
 diff --git third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
-index 7b9074f4195f..3f90e181f653 100644
+index 8633affac768..33cf529037bf 100644
 --- third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -12977,7 +13040,7 @@ index 7b9074f4195f..3f90e181f653 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13061,7 +13124,7 @@ index 7b9074f4195f..3f90e181f653 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13087,7 +13150,7 @@ index 7b9074f4195f..3f90e181f653 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -13129,16 +13192,17 @@ index 7b9074f4195f..3f90e181f653 100644
 -
  Library("rtp_packet_sender_gn")
 diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index 606080c53eb5..8228db31aa88 100644
+index 77147103940a..7ecd88710970 100644
 --- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -13154,7 +13218,7 @@ index 606080c53eb5..8228db31aa88 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13249,7 +13313,7 @@ index 606080c53eb5..8228db31aa88 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13336,16 +13400,17 @@ index 606080c53eb5..8228db31aa88 100644
  
  Library("rtp_parameters_gn")
 diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-index 4d2b9eb891c6..b14399134c2d 100644
+index f0edbf322769..b120b4bb3ae7 100644
 --- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -13361,7 +13426,7 @@ index 4d2b9eb891c6..b14399134c2d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13445,7 +13510,7 @@ index 4d2b9eb891c6..b14399134c2d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13471,7 +13536,7 @@ index 4d2b9eb891c6..b14399134c2d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -13513,16 +13578,17 @@ index 4d2b9eb891c6..b14399134c2d 100644
 -
  Library("rtp_sender_interface_gn")
 diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-index 638db7eff309..361fb3659953 100644
+index 3c9c3dead49c..c2b7a4d94d6b 100644
 --- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -13538,7 +13604,7 @@ index 638db7eff309..361fb3659953 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13633,7 +13699,7 @@ index 638db7eff309..361fb3659953 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13720,16 +13786,17 @@ index 638db7eff309..361fb3659953 100644
  
  Library("rtp_sender_setparameters_callback_gn")
 diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index 2ac81053797a..ad498fba2370 100644
+index c04080729481..a559b623a1c8 100644
 --- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -13745,7 +13812,7 @@ index 2ac81053797a..ad498fba2370 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13829,7 +13896,7 @@ index 2ac81053797a..ad498fba2370 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -13855,7 +13922,7 @@ index 2ac81053797a..ad498fba2370 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -13897,16 +13964,17 @@ index 2ac81053797a..ad498fba2370 100644
 -
  Library("rtp_transceiver_direction_gn")
 diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-index 538b3be29bf7..d21843a6e841 100644
+index 372060cc8e60..1c78b06a3a69 100644
 --- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
 +++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -13922,7 +13990,7 @@ index 538b3be29bf7..d21843a6e841 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14006,7 +14074,7 @@ index 538b3be29bf7..d21843a6e841 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14032,7 +14100,7 @@ index 538b3be29bf7..d21843a6e841 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -14074,16 +14142,17 @@ index 538b3be29bf7..d21843a6e841 100644
 -
  Library("scoped_refptr_gn")
 diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
-index 7191593a76b3..3d6fb81819e5 100644
+index 202cdcfec066..0ba8df75a479 100644
 --- third_party/libwebrtc/api/sequence_checker_gn/moz.build
 +++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -14099,7 +14168,7 @@ index 7191593a76b3..3d6fb81819e5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14187,7 +14256,7 @@ index 7191593a76b3..3d6fb81819e5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14213,7 +14282,7 @@ index 7191593a76b3..3d6fb81819e5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -14255,16 +14324,17 @@ index 7191593a76b3..3d6fb81819e5 100644
 -
  Library("sequence_checker_gn")
 diff --git third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
-index 369ff54e9cc8..6cc93ea1aeff 100644
+index 79722688a0fa..835991310710 100644
 --- third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -14280,7 +14350,7 @@ index 369ff54e9cc8..6cc93ea1aeff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14364,7 +14434,7 @@ index 369ff54e9cc8..6cc93ea1aeff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14390,7 +14460,7 @@ index 369ff54e9cc8..6cc93ea1aeff 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -14432,16 +14502,17 @@ index 369ff54e9cc8..6cc93ea1aeff 100644
 -
  Library("default_task_queue_factory_gn")
 diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-index 3103b41da833..04259db6efb1 100644
+index 9b6c8a645bac..70ad2ed675e6 100644
 --- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -14457,7 +14528,7 @@ index 3103b41da833..04259db6efb1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14545,7 +14616,7 @@ index 3103b41da833..04259db6efb1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14632,16 +14703,17 @@ index 3103b41da833..04259db6efb1 100644
  
  Library("pending_task_safety_flag_gn")
 diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-index 4dfef6fa6711..c94462630755 100644
+index b4bf3a99e93c..21ee0f1e029a 100644
 --- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -14657,7 +14729,7 @@ index 4dfef6fa6711..c94462630755 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14745,7 +14817,7 @@ index 4dfef6fa6711..c94462630755 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14832,16 +14904,17 @@ index 4dfef6fa6711..c94462630755 100644
  
  Library("task_queue_gn")
 diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
-index b09ad121a6af..53e93cf4ca63 100644
+index 9ba994bcc93b..438b52d51495 100644
 --- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -14857,7 +14930,7 @@ index b09ad121a6af..53e93cf4ca63 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14941,7 +15014,7 @@ index b09ad121a6af..53e93cf4ca63 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -14967,7 +15040,7 @@ index b09ad121a6af..53e93cf4ca63 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -15009,16 +15082,17 @@ index b09ad121a6af..53e93cf4ca63 100644
 -
  Library("bandwidth_estimation_settings_gn")
 diff --git third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
-index a6b96ce34164..d6a055dc77ba 100644
+index 67cdefc24eb9..6d37fbfc3b83 100644
 --- third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -15034,7 +15108,7 @@ index a6b96ce34164..d6a055dc77ba 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15118,7 +15192,7 @@ index a6b96ce34164..d6a055dc77ba 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15144,7 +15218,7 @@ index a6b96ce34164..d6a055dc77ba 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -15186,16 +15260,17 @@ index a6b96ce34164..d6a055dc77ba 100644
 -
  Library("bandwidth_usage_gn")
 diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index 1f1d1c4c736a..ce48d9240524 100644
+index b067d9cb78c0..e7e6447577b6 100644
 --- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -15211,7 +15286,7 @@ index 1f1d1c4c736a..ce48d9240524 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15295,7 +15370,7 @@ index 1f1d1c4c736a..ce48d9240524 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15382,16 +15457,17 @@ index 1f1d1c4c736a..ce48d9240524 100644
  
  Library("bitrate_settings_gn")
 diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index cee851fd0446..b16ccce6f104 100644
+index 45e86a5de77e..71ad670256bb 100644
 --- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
 +++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -15407,7 +15483,7 @@ index cee851fd0446..b16ccce6f104 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15502,7 +15578,7 @@ index cee851fd0446..b16ccce6f104 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15528,7 +15604,7 @@ index cee851fd0446..b16ccce6f104 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -15570,16 +15646,17 @@ index cee851fd0446..b16ccce6f104 100644
 -
  Library("datagram_transport_interface_gn")
 diff --git third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
-index d398fe8173ce..de8ef38e2bbc 100644
+index 1817ad3dee5d..0664b6a30b2d 100644
 --- third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
 +++ third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -15595,7 +15672,7 @@ index d398fe8173ce..de8ef38e2bbc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15679,7 +15756,7 @@ index d398fe8173ce..de8ef38e2bbc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15705,7 +15782,7 @@ index d398fe8173ce..de8ef38e2bbc 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -15747,16 +15824,17 @@ index d398fe8173ce..de8ef38e2bbc 100644
 -
  Library("ecn_marking_gn")
 diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 0ea320c48cb1..7f4d08190fbd 100644
+index 3b737c521722..1a7f06e80251 100644
 --- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
 +++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -15772,7 +15850,7 @@ index 0ea320c48cb1..7f4d08190fbd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15868,7 +15946,7 @@ index 0ea320c48cb1..7f4d08190fbd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -15955,16 +16033,17 @@ index 0ea320c48cb1..7f4d08190fbd 100644
  
  Library("goog_cc_gn")
 diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index 3daf12907a25..fe17cc7e3b41 100644
+index 47194f0c32dd..92726f79e8b9 100644
 --- third_party/libwebrtc/api/transport/network_control_gn/moz.build
 +++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -15980,7 +16059,7 @@ index 3daf12907a25..fe17cc7e3b41 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16075,7 +16154,7 @@ index 3daf12907a25..fe17cc7e3b41 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16162,16 +16241,17 @@ index 3daf12907a25..fe17cc7e3b41 100644
  
  Library("network_control_gn")
 diff --git third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-index ae81701a1bd9..8f83c4414424 100644
+index b486440d104e..20d0d55a1dd1 100644
 --- third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
 +++ third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -16187,7 +16267,7 @@ index ae81701a1bd9..8f83c4414424 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16275,7 +16355,7 @@ index ae81701a1bd9..8f83c4414424 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16362,16 +16442,17 @@ index ae81701a1bd9..8f83c4414424 100644
  
  Library("corruption_detection_message_gn")
 diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-index c491583efb60..d0cc148b59ed 100644
+index fa798e5aa891..4b51d07bb431 100644
 --- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
 +++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -16387,7 +16468,7 @@ index c491583efb60..d0cc148b59ed 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16475,7 +16556,7 @@ index c491583efb60..d0cc148b59ed 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16562,16 +16643,17 @@ index c491583efb60..d0cc148b59ed 100644
  
  Library("dependency_descriptor_gn")
 diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index cb0e7defe522..793859a3646e 100644
+index 779196b8a434..ae1e889f8f52 100644
 --- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
 +++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -16587,7 +16669,7 @@ index cb0e7defe522..793859a3646e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16682,7 +16764,7 @@ index cb0e7defe522..793859a3646e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16708,7 +16790,7 @@ index cb0e7defe522..793859a3646e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -16750,16 +16832,17 @@ index cb0e7defe522..793859a3646e 100644
 -
  Library("rtp_source_gn")
 diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-index d04fea40304d..204fddb0f9fe 100644
+index 2e205d752b94..495e44ae5c57 100644
 --- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
 +++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -16775,7 +16858,7 @@ index d04fea40304d..204fddb0f9fe 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16859,7 +16942,7 @@ index d04fea40304d..204fddb0f9fe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -16885,7 +16968,7 @@ index d04fea40304d..204fddb0f9fe 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -16927,16 +17010,17 @@ index d04fea40304d..204fddb0f9fe 100644
 -
  Library("stun_types_gn")
 diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index 7af13124c2db..c979fda6e5bc 100644
+index 83b044a1f4d1..2aec02909909 100644
 --- third_party/libwebrtc/api/transport_api_gn/moz.build
 +++ third_party/libwebrtc/api/transport_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -16952,7 +17036,7 @@ index 7af13124c2db..c979fda6e5bc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16971,10 +17055,6 @@ index 7af13124c2db..c979fda6e5bc 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -17040,7 +17120,7 @@ index 7af13124c2db..c979fda6e5bc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17098,10 +17178,10 @@ index 7af13124c2db..c979fda6e5bc 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -17112,10 +17192,10 @@ index 7af13124c2db..c979fda6e5bc 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -17127,16 +17207,17 @@ index 7af13124c2db..c979fda6e5bc 100644
  
  Library("transport_api_gn")
 diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index 1b35b7cf5a8a..14ba2c78be54 100644
+index 30d4ac25134d..49502976bf76 100644
 --- third_party/libwebrtc/api/units/data_rate_gn/moz.build
 +++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -17152,7 +17233,7 @@ index 1b35b7cf5a8a..14ba2c78be54 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17240,7 +17321,7 @@ index 1b35b7cf5a8a..14ba2c78be54 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17327,16 +17408,17 @@ index 1b35b7cf5a8a..14ba2c78be54 100644
  
  Library("data_rate_gn")
 diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index 6f099efeb030..ed647bda87f0 100644
+index 20497c4aaf2a..42d6364fdafd 100644
 --- third_party/libwebrtc/api/units/data_size_gn/moz.build
 +++ third_party/libwebrtc/api/units/data_size_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -17352,7 +17434,7 @@ index 6f099efeb030..ed647bda87f0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17440,7 +17522,7 @@ index 6f099efeb030..ed647bda87f0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17527,16 +17609,17 @@ index 6f099efeb030..ed647bda87f0 100644
  
  Library("data_size_gn")
 diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index deea0df50db3..d23c1b6e2035 100644
+index be967f74384f..48e8518bdba0 100644
 --- third_party/libwebrtc/api/units/frequency_gn/moz.build
 +++ third_party/libwebrtc/api/units/frequency_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -17552,7 +17635,7 @@ index deea0df50db3..d23c1b6e2035 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17640,7 +17723,7 @@ index deea0df50db3..d23c1b6e2035 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17727,16 +17810,17 @@ index deea0df50db3..d23c1b6e2035 100644
  
  Library("frequency_gn")
 diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index 33ad19538d59..59b23badc5ef 100644
+index 985ca9fd0ccb..0be032310daa 100644
 --- third_party/libwebrtc/api/units/time_delta_gn/moz.build
 +++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -17752,7 +17836,7 @@ index 33ad19538d59..59b23badc5ef 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17840,7 +17924,7 @@ index 33ad19538d59..59b23badc5ef 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -17927,16 +18011,17 @@ index 33ad19538d59..59b23badc5ef 100644
  
  Library("time_delta_gn")
 diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index 5f80d61516fd..73a877084b26 100644
+index f8af308dd848..19d4a00c9a8a 100644
 --- third_party/libwebrtc/api/units/timestamp_gn/moz.build
 +++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -17952,7 +18037,7 @@ index 5f80d61516fd..73a877084b26 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18040,7 +18125,7 @@ index 5f80d61516fd..73a877084b26 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18127,16 +18212,17 @@ index 5f80d61516fd..73a877084b26 100644
  
  Library("timestamp_gn")
 diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index 5eb24e52173a..bae12fef07bf 100644
+index 31ae113bdd07..4ddc0e58c0d5 100644
 --- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -18152,7 +18238,7 @@ index 5eb24e52173a..bae12fef07bf 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18248,7 +18334,7 @@ index 5eb24e52173a..bae12fef07bf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18335,16 +18421,17 @@ index 5eb24e52173a..bae12fef07bf 100644
  
  Library("builtin_video_bitrate_allocator_factory_gn")
 diff --git third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build
-index 7d27f32fdcc4..df99de8e431f 100644
+index 01ad591a7c6f..5de13c427230 100644
 --- third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build
 +++ third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -18360,7 +18447,7 @@ index 7d27f32fdcc4..df99de8e431f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18448,7 +18535,7 @@ index 7d27f32fdcc4..df99de8e431f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18535,16 +18622,17 @@ index 7d27f32fdcc4..df99de8e431f 100644
  
  Library("corruption_detection_settings_generator_gn")
 diff --git third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
-index e38f35fd89c4..7f0f4946ad7c 100644
+index 2de7652d9c1c..a36714e723d9 100644
 --- third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
 +++ third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -18560,7 +18648,7 @@ index e38f35fd89c4..7f0f4946ad7c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18644,7 +18732,7 @@ index e38f35fd89c4..7f0f4946ad7c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18670,7 +18758,7 @@ index e38f35fd89c4..7f0f4946ad7c 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -18712,16 +18800,17 @@ index e38f35fd89c4..7f0f4946ad7c 100644
 -
  Library("filter_settings_gn")
 diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
-index 784b4ebfa65a..5fd5f86f273b 100644
+index 6264eae7114d..3e490c0856f6 100644
 --- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
 +++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -18737,7 +18826,7 @@ index 784b4ebfa65a..5fd5f86f273b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18825,7 +18914,7 @@ index 784b4ebfa65a..5fd5f86f273b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -18912,16 +19001,17 @@ index 784b4ebfa65a..5fd5f86f273b 100644
  
  Library("frame_instrumentation_data_gn")
 diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
-index f50de2a3968f..aac961573d3a 100644
+index 4519d584e947..1873d1639ca9 100644
 --- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
 +++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_data_reader_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -18937,7 +19027,7 @@ index f50de2a3968f..aac961573d3a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19032,7 +19122,7 @@ index f50de2a3968f..aac961573d3a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19119,16 +19209,17 @@ index f50de2a3968f..aac961573d3a 100644
  
  Library("frame_instrumentation_data_reader_gn")
 diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-index 259f7cf19bd8..8e982b933563 100644
+index 68fc563966c7..b716dca500b7 100644
 --- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
 +++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -19144,7 +19235,7 @@ index 259f7cf19bd8..8e982b933563 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19239,7 +19330,7 @@ index 259f7cf19bd8..8e982b933563 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19325,17 +19416,18 @@ index 259f7cf19bd8..8e982b933563 100644
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
  Library("frame_instrumentation_evaluation_gn")
-diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-index d27cd0dd54cb..fde241ef5f97 100644
---- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-+++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_factory_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_factory_gn/moz.build
+index e8ad9d760c9e..1166b2275b13 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_factory_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_factory_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -19351,7 +19443,7 @@ index d27cd0dd54cb..fde241ef5f97 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19447,7 +19539,7 @@ index d27cd0dd54cb..fde241ef5f97 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19532,18 +19624,208 @@ index d27cd0dd54cb..fde241ef5f97 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("frame_instrumentation_generator_gn")
+ Library("frame_instrumentation_generator_factory_gn")
+diff --git third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_header_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_header_gn/moz.build
+index ef2171a2698c..d24980f1e6fe 100644
+--- third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_header_gn/moz.build
++++ third_party/libwebrtc/api/video/corruption_detection/frame_instrumentation_generator_header_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
+     DEFINES["__ARM_NEON__"] = "1"
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("frame_instrumentation_generator_header_gn")
 diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index f43d0c641ef3..d2b102c61127 100644
+index aad431de5d96..e307b40e233e 100644
 --- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -19559,7 +19841,7 @@ index f43d0c641ef3..d2b102c61127 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19654,7 +19936,7 @@ index f43d0c641ef3..d2b102c61127 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19741,16 +20023,17 @@ index f43d0c641ef3..d2b102c61127 100644
  
  Library("encoded_frame_gn")
 diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index 858df454d82a..85fa5f6f2ae1 100644
+index 8b9dabd83253..83176a3e528a 100644
 --- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -19766,7 +20049,7 @@ index 858df454d82a..85fa5f6f2ae1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19861,7 +20144,7 @@ index 858df454d82a..85fa5f6f2ae1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -19948,16 +20231,17 @@ index 858df454d82a..85fa5f6f2ae1 100644
  
  Library("encoded_image_gn")
 diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index 0e97349cfc77..068e9983902f 100644
+index 1ef6ad14264e..f7d2dc335f54 100644
 --- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
 +++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -19973,7 +20257,7 @@ index 0e97349cfc77..068e9983902f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20069,7 +20353,7 @@ index 0e97349cfc77..068e9983902f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20156,16 +20440,17 @@ index 0e97349cfc77..068e9983902f 100644
  
  Library("frame_buffer_gn")
 diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index dbe54e47fb98..9b136ac42704 100644
+index a716132b70bd..1dd4e8356149 100644
 --- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -20181,7 +20466,7 @@ index dbe54e47fb98..9b136ac42704 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20276,7 +20561,7 @@ index dbe54e47fb98..9b136ac42704 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20302,7 +20587,7 @@ index dbe54e47fb98..9b136ac42704 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20344,16 +20629,17 @@ index dbe54e47fb98..9b136ac42704 100644
 -
  Library("recordable_encoded_frame_gn")
 diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-index 84f9a2b2c68a..d15140c641c2 100644
+index 72616c33da00..29e63f558f42 100644
 --- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
 +++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -20369,7 +20655,7 @@ index 84f9a2b2c68a..d15140c641c2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20453,7 +20739,7 @@ index 84f9a2b2c68a..d15140c641c2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20479,7 +20765,7 @@ index 84f9a2b2c68a..d15140c641c2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20521,16 +20807,17 @@ index 84f9a2b2c68a..d15140c641c2 100644
 -
  Library("render_resolution_gn")
 diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build
-index 4a33d1cb0e9e..4080a7a25dd3 100644
+index f4958166c999..435abc4c204b 100644
 --- third_party/libwebrtc/api/video/resolution_gn/moz.build
 +++ third_party/libwebrtc/api/video/resolution_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -20546,7 +20833,7 @@ index 4a33d1cb0e9e..4080a7a25dd3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20630,7 +20917,7 @@ index 4a33d1cb0e9e..4080a7a25dd3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20656,7 +20943,7 @@ index 4a33d1cb0e9e..4080a7a25dd3 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -20698,16 +20985,17 @@ index 4a33d1cb0e9e..4080a7a25dd3 100644
 -
  Library("resolution_gn")
 diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-index 6c2807380aff..ad2ccb022fdc 100644
+index 4d7e9e06d9c0..bf7ab3698efe 100644
 --- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -20723,7 +21011,7 @@ index 6c2807380aff..ad2ccb022fdc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20811,7 +21099,7 @@ index 6c2807380aff..ad2ccb022fdc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -20898,16 +21186,17 @@ index 6c2807380aff..ad2ccb022fdc 100644
  
  Library("video_adaptation_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index a18df7dbd8f7..6343a67de50e 100644
+index 686508519872..e1577975d92c 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -20923,7 +21212,7 @@ index a18df7dbd8f7..6343a67de50e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21011,7 +21300,7 @@ index a18df7dbd8f7..6343a67de50e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21098,16 +21387,17 @@ index a18df7dbd8f7..6343a67de50e 100644
  
  Library("video_bitrate_allocation_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index 5091c53d089e..a62643cf926a 100644
+index 2696cee37763..6bf1750c41cc 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -21123,7 +21413,7 @@ index 5091c53d089e..a62643cf926a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21218,7 +21508,7 @@ index 5091c53d089e..a62643cf926a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21244,7 +21534,7 @@ index 5091c53d089e..a62643cf926a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -21286,16 +21576,17 @@ index 5091c53d089e..a62643cf926a 100644
 -
  Library("video_bitrate_allocator_factory_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index 37a5eb0ed8c2..175739fe4569 100644
+index c82bfa04c91d..d200dea25fc6 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -21311,7 +21602,7 @@ index 37a5eb0ed8c2..175739fe4569 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21399,7 +21690,7 @@ index 37a5eb0ed8c2..175739fe4569 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21486,16 +21777,17 @@ index 37a5eb0ed8c2..175739fe4569 100644
  
  Library("video_bitrate_allocator_gn")
 diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index 258360394b9b..0b37739d6af2 100644
+index fecdc22c7eb9..f67e3175f815 100644
 --- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -21511,7 +21803,7 @@ index 258360394b9b..0b37739d6af2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21595,7 +21887,7 @@ index 258360394b9b..0b37739d6af2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21621,7 +21913,7 @@ index 258360394b9b..0b37739d6af2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -21663,16 +21955,17 @@ index 258360394b9b..0b37739d6af2 100644
 -
  Library("video_codec_constants_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index 002adff7180e..22b486c49f35 100644
+index 1a8124cc46aa..831df1f15351 100644
 --- third_party/libwebrtc/api/video/video_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -21688,7 +21981,7 @@ index 002adff7180e..22b486c49f35 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,93 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21783,7 +22076,7 @@ index 002adff7180e..22b486c49f35 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -152,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -21870,16 +22163,17 @@ index 002adff7180e..22b486c49f35 100644
  
  Library("video_frame_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index 95be4b1cae96..99647b85c184 100644
+index e55b60edc278..ed1c18c9ffdb 100644
 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -21895,7 +22189,7 @@ index 95be4b1cae96..99647b85c184 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,93 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21990,7 +22284,7 @@ index 95be4b1cae96..99647b85c184 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22077,16 +22371,17 @@ index 95be4b1cae96..99647b85c184 100644
  
  Library("video_frame_i010_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index 874879d32abc..a472607df4b9 100644
+index f9c1621a35c1..bfa4aa8688b4 100644
 --- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -22102,7 +22397,7 @@ index 874879d32abc..a472607df4b9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22197,7 +22492,7 @@ index 874879d32abc..a472607df4b9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22284,16 +22579,17 @@ index 874879d32abc..a472607df4b9 100644
  
  Library("video_frame_metadata_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index 5c47765d9f2f..e05d85a65fe4 100644
+index 6182a21045ed..efdfefa552bf 100644
 --- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -22309,7 +22605,7 @@ index 5c47765d9f2f..e05d85a65fe4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22397,7 +22693,7 @@ index 5c47765d9f2f..e05d85a65fe4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22423,7 +22719,7 @@ index 5c47765d9f2f..e05d85a65fe4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -22465,16 +22761,17 @@ index 5c47765d9f2f..e05d85a65fe4 100644
 -
  Library("video_frame_type_gn")
 diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-index 5628699424f6..23d72244a799 100644
+index b3fb4f33a349..82dbf3e13356 100644
 --- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -22490,7 +22787,7 @@ index 5628699424f6..23d72244a799 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22578,7 +22875,7 @@ index 5628699424f6..23d72244a799 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22604,7 +22901,7 @@ index 5628699424f6..23d72244a799 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -22646,16 +22943,17 @@ index 5628699424f6..23d72244a799 100644
 -
  Library("video_layers_allocation_gn")
 diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index 99588de22230..e3d29e8670c4 100644
+index e4e734b120b0..6de453224f65 100644
 --- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -22671,7 +22969,7 @@ index 99588de22230..e3d29e8670c4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22766,7 +23064,7 @@ index 99588de22230..e3d29e8670c4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22853,16 +23151,17 @@ index 99588de22230..e3d29e8670c4 100644
  
  Library("video_rtp_headers_gn")
 diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index 23e709e46e9c..4df907e99963 100644
+index d1b25b5de47d..3412ade2fbe8 100644
 --- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -22878,7 +23177,7 @@ index 23e709e46e9c..4df907e99963 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22973,7 +23272,7 @@ index 23e709e46e9c..4df907e99963 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -22999,7 +23298,7 @@ index 23e709e46e9c..4df907e99963 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -23041,16 +23340,17 @@ index 23e709e46e9c..4df907e99963 100644
 -
  Library("video_stream_encoder_gn")
 diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index 6e26714bac12..b20f7bf51dff 100644
+index cbb531a61dc3..5a7b5ac4b50f 100644
 --- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -23066,7 +23366,7 @@ index 6e26714bac12..b20f7bf51dff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23085,10 +23385,6 @@ index 6e26714bac12..b20f7bf51dff 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -23154,7 +23450,7 @@ index 6e26714bac12..b20f7bf51dff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23180,7 +23476,7 @@ index 6e26714bac12..b20f7bf51dff 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -23222,16 +23518,17 @@ index 6e26714bac12..b20f7bf51dff 100644
 -
  Library("bitstream_parser_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-index 67ef507d3097..7c7190358344 100644
+index 9621c58f7e1b..01b3430d5458 100644
 --- third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -23247,7 +23544,7 @@ index 67ef507d3097..7c7190358344 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23343,7 +23640,7 @@ index 67ef507d3097..7c7190358344 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23430,16 +23727,17 @@ index 67ef507d3097..7c7190358344 100644
  
  Library("builtin_video_decoder_factory_gn")
 diff --git third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build
-index e530a601ccdb..9e28578aba61 100644
+index 1f5ef3816dd2..d8079d2e7cf4 100644
 --- third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -23455,7 +23753,7 @@ index e530a601ccdb..9e28578aba61 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23550,7 +23848,7 @@ index e530a601ccdb..9e28578aba61 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23637,16 +23935,17 @@ index e530a601ccdb..9e28578aba61 100644
  
  Library("encoder_speed_controller_factory_gn")
 diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index 86d649512c50..b757e05614e6 100644
+index afbdb5631389..efbb1934406d 100644
 --- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -23662,7 +23961,7 @@ index 86d649512c50..b757e05614e6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23758,7 +24057,7 @@ index 86d649512c50..b757e05614e6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -23845,16 +24144,17 @@ index 86d649512c50..b757e05614e6 100644
  
  Library("rtc_software_fallback_wrappers_gn")
 diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-index a6663bb723e5..d08276393a91 100644
+index 0a1c6fda7837..9212e20cc7fb 100644
 --- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -23870,7 +24170,7 @@ index a6663bb723e5..d08276393a91 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23958,7 +24258,7 @@ index a6663bb723e5..d08276393a91 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24045,16 +24345,17 @@ index a6663bb723e5..d08276393a91 100644
  
  Library("scalability_mode_gn")
 diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build
-index a9bb91e7a5c5..e46a698b55c9 100644
+index f4111f4d40a2..07cdaf2be0c0 100644
 --- third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -24070,7 +24371,7 @@ index a9bb91e7a5c5..e46a698b55c9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24165,7 +24466,7 @@ index a9bb91e7a5c5..e46a698b55c9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24252,16 +24553,17 @@ index a9bb91e7a5c5..e46a698b55c9 100644
  
  Library("scalability_mode_helper_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index 32e58da25377..fb69cedb88b3 100644
+index 4cff7a677a60..cc125d92864e 100644
 --- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -24277,7 +24579,7 @@ index 32e58da25377..fb69cedb88b3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24372,7 +24674,7 @@ index 32e58da25377..fb69cedb88b3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24459,16 +24761,17 @@ index 32e58da25377..fb69cedb88b3 100644
  
  Library("video_codecs_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
-index 4ace541c8629..1ba39e749117 100644
+index 76d5b535f9ae..b70a2455f90a 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -24484,7 +24787,7 @@ index 4ace541c8629..1ba39e749117 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24579,7 +24882,7 @@ index 4ace541c8629..1ba39e749117 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24605,7 +24908,7 @@ index 4ace541c8629..1ba39e749117 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -24647,16 +24950,17 @@ index 4ace541c8629..1ba39e749117 100644
 -
  Library("video_encoder_factory_template_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
-index 2a97afcba467..cc35215f7f73 100644
+index 69ae5b04cd19..109aacfdd350 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -24672,7 +24976,7 @@ index 2a97afcba467..cc35215f7f73 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24768,7 +25072,7 @@ index 2a97afcba467..cc35215f7f73 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24794,7 +25098,7 @@ index 2a97afcba467..cc35215f7f73 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -24836,16 +25140,17 @@ index 2a97afcba467..cc35215f7f73 100644
 -
  Library("video_encoder_factory_template_libaom_av1_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
-index 0ed909d22eaa..30b36e992434 100644
+index 8edf81a7caf2..254dba975890 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -24861,7 +25166,7 @@ index 0ed909d22eaa..30b36e992434 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24957,7 +25262,7 @@ index 0ed909d22eaa..30b36e992434 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -24983,7 +25288,7 @@ index 0ed909d22eaa..30b36e992434 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25025,16 +25330,17 @@ index 0ed909d22eaa..30b36e992434 100644
 -
  Library("video_encoder_factory_template_libvpx_vp8_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
-index 35016b696d1f..c7733ec4e5b5 100644
+index 36afae08faa8..51be2a75a16c 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -25050,7 +25356,7 @@ index 35016b696d1f..c7733ec4e5b5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25146,7 +25452,7 @@ index 35016b696d1f..c7733ec4e5b5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25172,7 +25478,7 @@ index 35016b696d1f..c7733ec4e5b5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25214,16 +25520,17 @@ index 35016b696d1f..c7733ec4e5b5 100644
 -
  Library("video_encoder_factory_template_libvpx_vp9_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
-index d6781fc429cb..e8a512374002 100644
+index 318b0ff19c7d..8c386f142ace 100644
 --- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -25239,7 +25546,7 @@ index d6781fc429cb..e8a512374002 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25335,7 +25642,7 @@ index d6781fc429cb..e8a512374002 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25361,7 +25668,7 @@ index d6781fc429cb..e8a512374002 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25403,16 +25710,17 @@ index d6781fc429cb..e8a512374002 100644
 -
  Library("video_encoder_factory_template_open_h264_adapter_gn")
 diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 0da2c0072645..528d6c674073 100644
+index 0ebe6d733845..e41c36e17f3b 100644
 --- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -25428,7 +25736,7 @@ index 0da2c0072645..528d6c674073 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25524,7 +25832,7 @@ index 0da2c0072645..528d6c674073 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25611,16 +25919,17 @@ index 0da2c0072645..528d6c674073 100644
  
  Library("vp8_temporal_layers_factory_gn")
 diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index eff44f748eb9..999796fa561f 100644
+index 6aa22a8ca529..0133f34ce274 100644
 --- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
 +++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -25636,7 +25945,7 @@ index eff44f748eb9..999796fa561f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25720,7 +26029,7 @@ index eff44f748eb9..999796fa561f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25746,7 +26055,7 @@ index eff44f748eb9..999796fa561f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -25788,16 +26097,17 @@ index eff44f748eb9..999796fa561f 100644
 -
  Library("video_track_source_constraints_gn")
 diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index 751823b44d2f..f68a83cbef23 100644
+index f1fb005147a7..a1761896415e 100644
 --- third_party/libwebrtc/audio/audio_gn/moz.build
 +++ third_party/libwebrtc/audio/audio_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -25813,7 +26123,7 @@ index 751823b44d2f..f68a83cbef23 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,94 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -60,94 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25909,7 +26219,7 @@ index 751823b44d2f..f68a83cbef23 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -155,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -25996,16 +26306,17 @@ index 751823b44d2f..f68a83cbef23 100644
  
  Library("audio_gn")
 diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index 00a2557568ab..d2a840371942 100644
+index e6b5c2e88958..644e04db81cf 100644
 --- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
 +++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -26021,7 +26332,7 @@ index 00a2557568ab..d2a840371942 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26116,7 +26427,7 @@ index 00a2557568ab..d2a840371942 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26203,16 +26514,17 @@ index 00a2557568ab..d2a840371942 100644
  
  Library("audio_frame_operations_gn")
 diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index 9c873a9f4383..97a9005397cf 100644
+index 5ef19fc3e1f0..27990096053c 100644
 --- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 +++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -26228,7 +26540,7 @@ index 9c873a9f4383..97a9005397cf 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -55,93 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26323,7 +26635,7 @@ index 9c873a9f4383..97a9005397cf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -149,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26410,16 +26722,17 @@ index 9c873a9f4383..97a9005397cf 100644
  
  Library("resource_adaptation_gn")
 diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index 0fdbdec46999..38a38464659a 100644
+index fe10ec0b6e3a..3f3a8a99d672 100644
 --- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
 +++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -26435,7 +26748,7 @@ index 0fdbdec46999..38a38464659a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26530,7 +26843,7 @@ index 0fdbdec46999..38a38464659a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26556,7 +26869,7 @@ index 0fdbdec46999..38a38464659a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -26598,16 +26911,17 @@ index 0fdbdec46999..38a38464659a 100644
 -
  Library("audio_sender_interface_gn")
 diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index 7b8696b587d4..10a5020edb33 100644
+index 1b585f7ee5c6..7c2b118e6061 100644
 --- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -26623,7 +26937,7 @@ index 7b8696b587d4..10a5020edb33 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26718,7 +27032,7 @@ index 7b8696b587d4..10a5020edb33 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -26805,16 +27119,17 @@ index 7b8696b587d4..10a5020edb33 100644
  
  Library("bitrate_allocator_gn")
 diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index cd5491bdefec..25c0b6e740f9 100644
+index fc5b882fc5e4..e3c3fa525188 100644
 --- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -26830,7 +27145,7 @@ index cd5491bdefec..25c0b6e740f9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26918,7 +27233,7 @@ index cd5491bdefec..25c0b6e740f9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27005,16 +27320,17 @@ index cd5491bdefec..25c0b6e740f9 100644
  
  Library("bitrate_configurator_gn")
 diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 4b923766e44a..72c3383fd96e 100644
+index 69ed7d0ecce5..1a6572e48cbf 100644
 --- third_party/libwebrtc/call/call_gn/moz.build
 +++ third_party/libwebrtc/call/call_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -27030,7 +27346,7 @@ index 4b923766e44a..72c3383fd96e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,94 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27126,7 +27442,7 @@ index 4b923766e44a..72c3383fd96e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27213,16 +27529,17 @@ index 4b923766e44a..72c3383fd96e 100644
  
  Library("call_gn")
 diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index 2b39c60732c3..e60a38eeef33 100644
+index 727de272bb92..b91e20a3c1b4 100644
 --- third_party/libwebrtc/call/call_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -27238,7 +27555,7 @@ index 2b39c60732c3..e60a38eeef33 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,94 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27334,7 +27651,7 @@ index 2b39c60732c3..e60a38eeef33 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27421,16 +27738,17 @@ index 2b39c60732c3..e60a38eeef33 100644
  
  Library("call_interfaces_gn")
 diff --git third_party/libwebrtc/call/payload_type_gn/moz.build third_party/libwebrtc/call/payload_type_gn/moz.build
-index b92feaad097c..a2eb5b7adca2 100644
+index 216ff5360920..ae039eb49b5a 100644
 --- third_party/libwebrtc/call/payload_type_gn/moz.build
 +++ third_party/libwebrtc/call/payload_type_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -27446,7 +27764,7 @@ index b92feaad097c..a2eb5b7adca2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27541,7 +27859,7 @@ index b92feaad097c..a2eb5b7adca2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27567,7 +27885,7 @@ index b92feaad097c..a2eb5b7adca2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -27609,16 +27927,17 @@ index b92feaad097c..a2eb5b7adca2 100644
 -
  Library("payload_type_gn")
 diff --git third_party/libwebrtc/call/payload_type_picker_gn/moz.build third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-index 71a4ce74fdb0..1efa64dbafa5 100644
+index 334b7f900f39..be111ed12b11 100644
 --- third_party/libwebrtc/call/payload_type_picker_gn/moz.build
 +++ third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -27634,7 +27953,7 @@ index 71a4ce74fdb0..1efa64dbafa5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27729,7 +28048,7 @@ index 71a4ce74fdb0..1efa64dbafa5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27816,16 +28135,17 @@ index 71a4ce74fdb0..1efa64dbafa5 100644
  
  Library("payload_type_picker_gn")
 diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index bb48e450e2a4..318dff45f0f9 100644
+index c42bd045a077..905df1b59073 100644
 --- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -27841,7 +28161,7 @@ index bb48e450e2a4..318dff45f0f9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27936,7 +28256,7 @@ index bb48e450e2a4..318dff45f0f9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -27962,7 +28282,7 @@ index bb48e450e2a4..318dff45f0f9 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -28004,16 +28324,17 @@ index bb48e450e2a4..318dff45f0f9 100644
 -
  Library("receive_stream_interface_gn")
 diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index bfeb90e9822d..d9502b3458ce 100644
+index 1c74c7252730..d5cbc5579e9d 100644
 --- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -28029,7 +28350,7 @@ index bfeb90e9822d..d9502b3458ce 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28124,7 +28445,7 @@ index bfeb90e9822d..d9502b3458ce 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28211,16 +28532,17 @@ index bfeb90e9822d..d9502b3458ce 100644
  
  Library("rtp_interfaces_gn")
 diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index 53e5ed96c15c..91f237e7a432 100644
+index f19f3de50080..e29c8cc61a97 100644
 --- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -28236,7 +28558,7 @@ index 53e5ed96c15c..91f237e7a432 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,94 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28332,7 +28654,7 @@ index 53e5ed96c15c..91f237e7a432 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28419,16 +28741,17 @@ index 53e5ed96c15c..91f237e7a432 100644
  
  Library("rtp_receiver_gn")
 diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index 3c344e2a71f3..34f4eee93bb4 100644
+index 65546290bad6..1f3917173fe7 100644
 --- third_party/libwebrtc/call/rtp_sender_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -28444,7 +28767,7 @@ index 3c344e2a71f3..34f4eee93bb4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,94 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28540,7 +28863,7 @@ index 3c344e2a71f3..34f4eee93bb4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28627,16 +28950,17 @@ index 3c344e2a71f3..34f4eee93bb4 100644
  
  Library("rtp_sender_gn")
 diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index e1d6a6a1229c..6ad8a263227e 100644
+index fc439b4f19cd..1f46680ee1a3 100644
 --- third_party/libwebrtc/call/version_gn/moz.build
 +++ third_party/libwebrtc/call/version_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -28652,7 +28976,7 @@ index e1d6a6a1229c..6ad8a263227e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28736,7 +29060,7 @@ index e1d6a6a1229c..6ad8a263227e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -28823,16 +29147,17 @@ index e1d6a6a1229c..6ad8a263227e 100644
  
  Library("version_gn")
 diff --git third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-index 201cca266c32..00e509a7b4aa 100644
+index bb93d9e6d16d..061e7cc3a2c0 100644
 --- third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
 +++ third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -28848,7 +29173,7 @@ index 201cca266c32..00e509a7b4aa 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28943,7 +29268,7 @@ index 201cca266c32..00e509a7b4aa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29030,16 +29355,17 @@ index 201cca266c32..00e509a7b4aa 100644
  
  Library("video_receive_stream_api_gn")
 diff --git third_party/libwebrtc/call/video_send_stream_api_gn/moz.build third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-index 6d75d15802d5..f750e52c2b20 100644
+index 82bf9b9a4898..b93c4ab838e8 100644
 --- third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
 +++ third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -29055,7 +29381,7 @@ index 6d75d15802d5..f750e52c2b20 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29150,7 +29476,7 @@ index 6d75d15802d5..f750e52c2b20 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29237,19 +29563,20 @@ index 6d75d15802d5..f750e52c2b20 100644
  
  Library("video_send_stream_api_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-index 3588afcceba4..efee4c684b12 100644
+index 2cae1809efd9..51dc05ae78b2 100644
 --- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,6 +18,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -25,7 +28,13 @@ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -29263,7 +29590,7 @@ index 3588afcceba4..efee4c684b12 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,122 +62,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,122 +63,9 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29388,16 +29715,17 @@ index 3588afcceba4..efee4c684b12 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-index a72dea0e692c..d0d04f598860 100644
+index 6e3099f66346..9bf5ef48c2aa 100644
 --- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -29413,7 +29741,7 @@ index a72dea0e692c..d0d04f598860 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29497,7 +29825,7 @@ index a72dea0e692c..d0d04f598860 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,30 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,30 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29528,7 +29856,7 @@ index a72dea0e692c..d0d04f598860 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -158,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -159,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -29570,16 +29898,17 @@ index a72dea0e692c..d0d04f598860 100644
 -
  Library("common_audio_c_arm_asm_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-index d75aa3581510..85f93bbcaadf 100644
+index c433476699a1..ae958bfe0bf9 100644
 --- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -29595,7 +29924,7 @@ index d75aa3581510..85f93bbcaadf 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -83,108 +92,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -84,108 +93,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29705,7 +30034,7 @@ index d75aa3581510..85f93bbcaadf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -192,20 +100,14 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -193,20 +101,14 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -29730,7 +30059,7 @@ index d75aa3581510..85f93bbcaadf 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
          "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -216,7 +118,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -217,7 +119,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
      DEFINES["MIPS32_LE"] = True
      DEFINES["MIPS_FPU_LE"] = True
@@ -29738,7 +30067,7 @@ index d75aa3581510..85f93bbcaadf 100644
  
      SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c"
-@@ -233,8 +134,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -234,8 +135,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
  if CONFIG["TARGET_CPU"] == "mips64":
  
@@ -29747,7 +30076,7 @@ index d75aa3581510..85f93bbcaadf 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
          "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -249,78 +148,7 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -250,78 +149,7 @@ if CONFIG["TARGET_CPU"] == "ppc64":
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
      ]
  
@@ -29827,7 +30156,7 @@ index d75aa3581510..85f93bbcaadf 100644
  
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -328,13 +156,13 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+@@ -329,13 +157,13 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
      ]
  
@@ -29843,7 +30172,7 @@ index d75aa3581510..85f93bbcaadf 100644
  
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -342,9 +170,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -343,9 +171,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
      ]
  
@@ -29856,16 +30185,17 @@ index d75aa3581510..85f93bbcaadf 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
 diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-index 47e1bb77f92a..5b67907b2df6 100644
+index 0711a246047b..e8df5c74b3f8 100644
 --- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -29881,7 +30211,7 @@ index 47e1bb77f92a..5b67907b2df6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29969,7 +30299,7 @@ index 47e1bb77f92a..5b67907b2df6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -30056,16 +30386,17 @@ index 47e1bb77f92a..5b67907b2df6 100644
  
  Library("common_audio_cc_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index 4b2f40786f1b..9649eb186b74 100644
+index a8c9acb93890..c7dd02321577 100644
 --- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -30081,7 +30412,7 @@ index 4b2f40786f1b..9649eb186b74 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -60,93 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30176,7 +30507,7 @@ index 4b2f40786f1b..9649eb186b74 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -154,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -30263,10 +30594,10 @@ index 4b2f40786f1b..9649eb186b74 100644
  
  Library("common_audio_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index 1c183693402d..52efab61eed2 100644
+index 394073de5157..85086d43db82 100644
 --- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-@@ -13,13 +13,24 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,10 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -30274,9 +30605,10 @@ index 1c183693402d..52efab61eed2 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_ARCH_ARM64"] = True
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
+@@ -20,7 +24,14 @@ DEFINES["WEBRTC_HAS_NEON"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30291,7 +30623,7 @@ index 1c183693402d..52efab61eed2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,131 +60,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,131 +61,6 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30424,10 +30756,10 @@ index 1c183693402d..52efab61eed2 100644
 -
  Library("common_audio_neon_c_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-index 9c94e51dfd8f..b3d1eae8da85 100644
+index 164aeb5c1cd9..952a7c5b85b1 100644
 --- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-@@ -13,13 +13,24 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,10 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -30435,9 +30767,10 @@ index 9c94e51dfd8f..b3d1eae8da85 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_ARCH_ARM64"] = True
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
+@@ -20,7 +24,14 @@ DEFINES["WEBRTC_HAS_NEON"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30452,7 +30785,7 @@ index 9c94e51dfd8f..b3d1eae8da85 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,138 +59,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,138 +60,6 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30592,19 +30925,20 @@ index 9c94e51dfd8f..b3d1eae8da85 100644
 -
  Library("common_audio_neon_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-index 8ce96ca06673..6703ddb08c0e 100644
+index 9cfcd88ca0fd..6c02d405d1fa 100644
 --- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -30618,7 +30952,7 @@ index 8ce96ca06673..6703ddb08c0e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,144 +57,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,144 +58,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30766,16 +31100,17 @@ index 8ce96ca06673..6703ddb08c0e 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-index accaf02cc53f..9c4b7ce7e534 100644
+index a4ae7a2dff86..5578a69366aa 100644
 --- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
 +++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -30791,7 +31126,7 @@ index accaf02cc53f..9c4b7ce7e534 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30886,7 +31221,7 @@ index accaf02cc53f..9c4b7ce7e534 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -30973,16 +31308,17 @@ index accaf02cc53f..9c4b7ce7e534 100644
  
  Library("fir_filter_factory_gn")
 diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index 785075282cd4..5e006e643f40 100644
+index 68fbdfae5e37..dc8ed904f2de 100644
 --- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
 +++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -30998,7 +31334,7 @@ index 785075282cd4..5e006e643f40 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31082,7 +31418,7 @@ index 785075282cd4..5e006e643f40 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -31108,7 +31444,7 @@ index 785075282cd4..5e006e643f40 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -31150,16 +31486,17 @@ index 785075282cd4..5e006e643f40 100644
 -
  Library("fir_filter_gn")
 diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-index 15e2cd1c8e4d..31ec751b206c 100644
+index 66977109414b..aadae017d4a1 100644
 --- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
 +++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -31175,7 +31512,7 @@ index 15e2cd1c8e4d..31ec751b206c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31270,7 +31607,7 @@ index 15e2cd1c8e4d..31ec751b206c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -31296,7 +31633,7 @@ index 15e2cd1c8e4d..31ec751b206c 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -31338,16 +31675,17 @@ index 15e2cd1c8e4d..31ec751b206c 100644
 -
  Library("sinc_resampler_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-index cab1d4bdd6df..aa3b4773526a 100644
+index 6923c7ad1f20..b46791b4e014 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -31363,7 +31701,7 @@ index cab1d4bdd6df..aa3b4773526a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31458,7 +31796,7 @@ index cab1d4bdd6df..aa3b4773526a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -144,122 +67,38 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,122 +68,38 @@ if CONFIG["TARGET_CPU"] == "aarch64":
          "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
      ]
  
@@ -31589,16 +31927,17 @@ index cab1d4bdd6df..aa3b4773526a 100644
  
  Library("fft_size_128_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-index 913e7fa3a754..4018659e1055 100644
+index 7832a9a5cc13..35c27ae43515 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -31614,7 +31953,7 @@ index 913e7fa3a754..4018659e1055 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31698,7 +32037,7 @@ index 913e7fa3a754..4018659e1055 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -31785,16 +32124,17 @@ index 913e7fa3a754..4018659e1055 100644
  
  Library("fft_size_256_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index 6045726afc80..969d9eb06c39 100644
+index 06b4e9233fb4..462a19eca697 100644
 --- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -31810,7 +32150,7 @@ index 6045726afc80..969d9eb06c39 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31906,7 +32246,7 @@ index 6045726afc80..969d9eb06c39 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,20 +59,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,20 +60,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -31929,7 +32269,7 @@ index 6045726afc80..969d9eb06c39 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
      ]
-@@ -159,7 +73,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -160,7 +74,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
      DEFINES["MIPS32_LE"] = True
      DEFINES["MIPS_FPU_LE"] = True
@@ -31937,7 +32277,7 @@ index 6045726afc80..969d9eb06c39 100644
  
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c"
-@@ -167,8 +80,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -168,8 +81,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
  
  if CONFIG["TARGET_CPU"] == "mips64":
  
@@ -31946,7 +32286,7 @@ index 6045726afc80..969d9eb06c39 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
      ]
-@@ -179,89 +90,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -180,89 +91,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
      ]
  
@@ -32042,16 +32382,17 @@ index 6045726afc80..969d9eb06c39 100644
      UNIFIED_SOURCES += [
          "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
 diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 29f0179f0773..4ee8b246ab59 100644
+index 737d2879cfff..81d7276e7ceb 100644
 --- third_party/libwebrtc/common_video/common_video_gn/moz.build
 +++ third_party/libwebrtc/common_video/common_video_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -32067,7 +32408,7 @@ index 29f0179f0773..4ee8b246ab59 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -58,93 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32162,7 +32503,7 @@ index 29f0179f0773..4ee8b246ab59 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -152,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32249,16 +32590,17 @@ index 29f0179f0773..4ee8b246ab59 100644
  
  Library("common_video_gn")
 diff --git third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
-index d6dca2520c59..530a94e8643b 100644
+index 1a7763027509..6984875a37a2 100644
 --- third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
 +++ third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -32274,7 +32616,7 @@ index d6dca2520c59..530a94e8643b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32369,7 +32711,7 @@ index d6dca2520c59..530a94e8643b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32395,7 +32737,7 @@ index d6dca2520c59..530a94e8643b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -32437,16 +32779,17 @@ index d6dca2520c59..530a94e8643b 100644
 -
  Library("corruption_score_calculator_gn")
 diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index 4d4150d00c2a..7242f0d8a3ae 100644
+index a823ba76ef89..f1c78abd2044 100644
 --- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
 +++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -32462,7 +32805,7 @@ index 4d4150d00c2a..7242f0d8a3ae 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32546,7 +32889,7 @@ index 4d4150d00c2a..7242f0d8a3ae 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32572,7 +32915,7 @@ index 4d4150d00c2a..7242f0d8a3ae 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -32614,16 +32957,17 @@ index 4d4150d00c2a..7242f0d8a3ae 100644
 -
  Library("frame_counts_gn")
 diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-index 8a8df2cad0f0..940b58e66a82 100644
+index 7128ebf8d791..4ee3fabc5efc 100644
 --- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
 +++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -32639,7 +32983,7 @@ index 8a8df2cad0f0..940b58e66a82 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32727,7 +33071,7 @@ index 8a8df2cad0f0..940b58e66a82 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32814,16 +33158,17 @@ index 8a8df2cad0f0..940b58e66a82 100644
  
  Library("generic_frame_descriptor_gn")
 diff --git third_party/libwebrtc/dcsctp_gn/moz.build third_party/libwebrtc/dcsctp_gn/moz.build
-index e36ba8e99307..d5c1d389564b 100644
+index 5d9d91542602..ab7d83d5027f 100644
 --- third_party/libwebrtc/dcsctp_gn/moz.build
 +++ third_party/libwebrtc/dcsctp_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -32839,7 +33184,7 @@ index e36ba8e99307..d5c1d389564b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32934,7 +33279,7 @@ index e36ba8e99307..d5c1d389564b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -32960,7 +33305,7 @@ index e36ba8e99307..d5c1d389564b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -33002,16 +33347,17 @@ index e36ba8e99307..d5c1d389564b 100644
 -
  Library("dcsctp_gn")
 diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-index c01a31a5b7da..164662ca337c 100644
+index 6a062878d058..a50d95f28021 100644
 --- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
 +++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -33027,7 +33373,7 @@ index c01a31a5b7da..164662ca337c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33111,7 +33457,7 @@ index c01a31a5b7da..164662ca337c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -33137,7 +33483,7 @@ index c01a31a5b7da..164662ca337c 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -33193,16 +33539,17 @@ index edb8e084a33a..e2236e78c4a0 100644
 -
  Library("registered_field_trials_header_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index 158436eafa45..251655a1a226 100644
+index 4caacde9e597..2a57be791af5 100644
 --- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -33218,7 +33565,7 @@ index 158436eafa45..251655a1a226 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33313,7 +33660,7 @@ index 158436eafa45..251655a1a226 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -33400,16 +33747,17 @@ index 158436eafa45..251655a1a226 100644
  
  Library("rtc_event_audio_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index 1ac713b1e2a5..552eb9cf4167 100644
+index ca62ef7f0235..2f13eb73c4cf 100644
 --- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -33425,7 +33773,7 @@ index 1ac713b1e2a5..552eb9cf4167 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,93 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33520,7 +33868,7 @@ index 1ac713b1e2a5..552eb9cf4167 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -33607,16 +33955,17 @@ index 1ac713b1e2a5..552eb9cf4167 100644
  
  Library("rtc_event_bwe_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_bwe_update_scream_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_update_scream_gn/moz.build
-index 9062c236ca30..c87ee9777bfc 100644
+index 53039864497e..b1c661aa383b 100644
 --- third_party/libwebrtc/logging/rtc_event_bwe_update_scream_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_bwe_update_scream_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -33632,7 +33981,7 @@ index 9062c236ca30..c87ee9777bfc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33720,7 +34069,7 @@ index 9062c236ca30..c87ee9777bfc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -33807,16 +34156,17 @@ index 9062c236ca30..c87ee9777bfc 100644
  
  Library("rtc_event_bwe_update_scream_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-index c1305a84a6cc..3087fdcc327a 100644
+index 03f2b09ba820..c451b3bd4f20 100644
 --- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -33832,7 +34182,7 @@ index c1305a84a6cc..3087fdcc327a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33927,7 +34277,7 @@ index c1305a84a6cc..3087fdcc327a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34014,16 +34364,17 @@ index c1305a84a6cc..3087fdcc327a 100644
  
  Library("rtc_event_field_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-index 81e5642488fb..27983ddaa07f 100644
+index 8b998ca6feb8..d6e83db5966b 100644
 --- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -34039,7 +34390,7 @@ index 81e5642488fb..27983ddaa07f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34127,7 +34478,7 @@ index 81e5642488fb..27983ddaa07f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34153,7 +34504,7 @@ index 81e5642488fb..27983ddaa07f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -34195,16 +34546,17 @@ index 81e5642488fb..27983ddaa07f 100644
 -
  Library("rtc_event_log_parse_status_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-index 68c681097dd3..f050b1ed6acd 100644
+index d6277f4decb7..991b3118284f 100644
 --- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -34220,7 +34572,7 @@ index 68c681097dd3..f050b1ed6acd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34308,7 +34660,7 @@ index 68c681097dd3..f050b1ed6acd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34395,16 +34747,17 @@ index 68c681097dd3..f050b1ed6acd 100644
  
  Library("rtc_event_number_encodings_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index 8e54172d3ffc..15705b114eb9 100644
+index 93e1f9bc11ed..11dac2a7f60f 100644
 --- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -34420,7 +34773,7 @@ index 8e54172d3ffc..15705b114eb9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34515,7 +34868,7 @@ index 8e54172d3ffc..15705b114eb9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34602,16 +34955,17 @@ index 8e54172d3ffc..15705b114eb9 100644
  
  Library("rtc_event_pacing_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index 3e27015753fd..7a52b559595d 100644
+index 68dc2bfa7beb..0e77be1355ef 100644
 --- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -34627,7 +34981,7 @@ index 3e27015753fd..7a52b559595d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34722,7 +35076,7 @@ index 3e27015753fd..7a52b559595d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -34809,16 +35163,17 @@ index 3e27015753fd..7a52b559595d 100644
  
  Library("rtc_event_rtp_rtcp_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index 79fa2f18c369..42638e9c1a58 100644
+index f0c0525595be..11ef3f0ed44f 100644
 --- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -34834,7 +35189,7 @@ index 79fa2f18c369..42638e9c1a58 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34929,7 +35284,7 @@ index 79fa2f18c369..42638e9c1a58 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35016,16 +35371,17 @@ index 79fa2f18c369..42638e9c1a58 100644
  
  Library("rtc_event_video_gn")
 diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index 4567caafbe26..2017f2c23000 100644
+index dcf8d7f09d38..2f43cb2d2006 100644
 --- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -35041,7 +35397,7 @@ index 4567caafbe26..2017f2c23000 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35136,7 +35492,7 @@ index 4567caafbe26..2017f2c23000 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35223,16 +35579,17 @@ index 4567caafbe26..2017f2c23000 100644
  
  Library("rtc_stream_config_gn")
 diff --git third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-index 170ceb38ea18..ff3ef7c10365 100644
+index 11862478ece2..5011e1a8de81 100644
 --- third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
 +++ third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -35248,7 +35605,7 @@ index 170ceb38ea18..ff3ef7c10365 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35343,7 +35700,7 @@ index 170ceb38ea18..ff3ef7c10365 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35430,16 +35787,17 @@ index 170ceb38ea18..ff3ef7c10365 100644
  
  Library("adapted_video_track_source_gn")
 diff --git third_party/libwebrtc/media/audio_source_gn/moz.build third_party/libwebrtc/media/audio_source_gn/moz.build
-index f1168831de90..5fd47ccaeddd 100644
+index f9b61e0992b6..e963839421c5 100644
 --- third_party/libwebrtc/media/audio_source_gn/moz.build
 +++ third_party/libwebrtc/media/audio_source_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -35455,7 +35813,7 @@ index f1168831de90..5fd47ccaeddd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35539,7 +35897,7 @@ index f1168831de90..5fd47ccaeddd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35565,7 +35923,7 @@ index f1168831de90..5fd47ccaeddd 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -35607,16 +35965,17 @@ index f1168831de90..5fd47ccaeddd 100644
 -
  Library("audio_source_gn")
 diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
-index 4dbfaebba1b4..ac11b1371193 100644
+index dde3a4d59f7d..f70556b82d58 100644
 --- third_party/libwebrtc/media/codec_gn/moz.build
 +++ third_party/libwebrtc/media/codec_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -35632,7 +35991,7 @@ index 4dbfaebba1b4..ac11b1371193 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35727,7 +36086,7 @@ index 4dbfaebba1b4..ac11b1371193 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35814,16 +36173,17 @@ index 4dbfaebba1b4..ac11b1371193 100644
  
  Library("codec_gn")
 diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
-index 0848daf93ca9..6dab893e0066 100644
+index 57b1ab31b118..1f0439830423 100644
 --- third_party/libwebrtc/media/media_channel_gn/moz.build
 +++ third_party/libwebrtc/media/media_channel_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -35839,7 +36199,7 @@ index 0848daf93ca9..6dab893e0066 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35935,7 +36295,7 @@ index 0848daf93ca9..6dab893e0066 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -35961,7 +36321,7 @@ index 0848daf93ca9..6dab893e0066 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -36003,16 +36363,17 @@ index 0848daf93ca9..6dab893e0066 100644
 -
  Library("media_channel_gn")
 diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-index e758c604f5f3..a59748d1b38c 100644
+index b61e75712420..a76fcc4e5c78 100644
 --- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
 +++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -36028,7 +36389,7 @@ index e758c604f5f3..a59748d1b38c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36112,7 +36473,7 @@ index e758c604f5f3..a59748d1b38c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36138,7 +36499,7 @@ index e758c604f5f3..a59748d1b38c 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -36180,16 +36541,17 @@ index e758c604f5f3..a59748d1b38c 100644
 -
  Library("media_channel_impl_gn")
 diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build
-index 95445fbdf6e8..68728dd78931 100644
+index 5fe486b68a37..a8fd0f0f0454 100644
 --- third_party/libwebrtc/media/media_constants_gn/moz.build
 +++ third_party/libwebrtc/media/media_constants_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -36205,7 +36567,7 @@ index 95445fbdf6e8..68728dd78931 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36289,7 +36651,7 @@ index 95445fbdf6e8..68728dd78931 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36376,16 +36738,17 @@ index 95445fbdf6e8..68728dd78931 100644
  
  Library("media_constants_gn")
 diff --git third_party/libwebrtc/media/media_engine_gn/moz.build third_party/libwebrtc/media/media_engine_gn/moz.build
-index cf139814ceb9..eaff43e12948 100644
+index fd9cda5ffd4c..61bee806c4b1 100644
 --- third_party/libwebrtc/media/media_engine_gn/moz.build
 +++ third_party/libwebrtc/media/media_engine_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -36401,7 +36764,7 @@ index cf139814ceb9..eaff43e12948 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36497,7 +36860,7 @@ index cf139814ceb9..eaff43e12948 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36523,7 +36886,7 @@ index cf139814ceb9..eaff43e12948 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -36565,16 +36928,17 @@ index cf139814ceb9..eaff43e12948 100644
 -
  Library("media_engine_gn")
 diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
-index 0989e698875d..2e232c6ada46 100644
+index 12d28827a3ba..ff79c9eed782 100644
 --- third_party/libwebrtc/media/rid_description_gn/moz.build
 +++ third_party/libwebrtc/media/rid_description_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -36590,7 +36954,7 @@ index 0989e698875d..2e232c6ada46 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36685,7 +37049,7 @@ index 0989e698875d..2e232c6ada46 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36772,16 +37136,17 @@ index 0989e698875d..2e232c6ada46 100644
  
  Library("rid_description_gn")
 diff --git third_party/libwebrtc/media/rtc_audio_video_gn/moz.build third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-index 72d03172392a..235284ab4f03 100644
+index 5ccdc1470201..6107cbff30be 100644
 --- third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-@@ -14,12 +14,21 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
+@@ -14,13 +14,22 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -36797,7 +37162,7 @@ index 72d03172392a..235284ab4f03 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,98 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,98 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36897,7 +37262,7 @@ index 72d03172392a..235284ab4f03 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -147,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -36984,16 +37349,17 @@ index 72d03172392a..235284ab4f03 100644
  
  Library("rtc_audio_video_gn")
 diff --git third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-index f72d9c49f1de..7254f017e2f2 100644
+index 02cf1310684b..4c8d93d30a60 100644
 --- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-@@ -14,12 +14,21 @@ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+@@ -14,13 +14,22 @@ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
  DEFINES["RTC_USE_LIBAOM_AV1_ENCODER"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -37009,7 +37375,7 @@ index f72d9c49f1de..7254f017e2f2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37105,7 +37471,7 @@ index f72d9c49f1de..7254f017e2f2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37192,16 +37558,17 @@ index f72d9c49f1de..7254f017e2f2 100644
  
  Library("rtc_internal_video_codecs_gn")
 diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index f465cb96722d..7110338b2381 100644
+index acebbb31bc5b..0de969134c2a 100644
 --- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -37217,7 +37584,7 @@ index f465cb96722d..7110338b2381 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37313,7 +37680,7 @@ index f465cb96722d..7110338b2381 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37339,7 +37706,7 @@ index f465cb96722d..7110338b2381 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37381,16 +37748,17 @@ index f465cb96722d..7110338b2381 100644
 -
  Library("rtc_media_base_gn")
 diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index ea8062a2e446..7b25a9566dbe 100644
+index 7211fe469ca8..58d9f577fe0a 100644
 --- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -37406,7 +37774,7 @@ index ea8062a2e446..7b25a9566dbe 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37490,7 +37858,7 @@ index ea8062a2e446..7b25a9566dbe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37516,7 +37884,7 @@ index ea8062a2e446..7b25a9566dbe 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37558,16 +37926,17 @@ index ea8062a2e446..7b25a9566dbe 100644
 -
  Library("rtc_media_config_gn")
 diff --git third_party/libwebrtc/media/rtc_media_gn/moz.build third_party/libwebrtc/media/rtc_media_gn/moz.build
-index 0feaa31871e0..d506d7e4b811 100644
+index 8f55e5017aae..8f2af7ccd1b1 100644
 --- third_party/libwebrtc/media/rtc_media_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_gn/moz.build
-@@ -14,12 +14,21 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
+@@ -14,13 +14,22 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -37583,7 +37952,7 @@ index 0feaa31871e0..d506d7e4b811 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,98 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,98 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37683,7 +38052,7 @@ index 0feaa31871e0..d506d7e4b811 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37709,7 +38078,7 @@ index 0feaa31871e0..d506d7e4b811 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -170,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -171,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -37751,16 +38120,17 @@ index 0feaa31871e0..d506d7e4b811 100644
 -
  Library("rtc_media_gn")
 diff --git third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-index a1618fa38d5e..9969fddbb391 100644
+index 497989616fd4..823dbd5b9496 100644
 --- third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -37776,7 +38146,7 @@ index a1618fa38d5e..9969fddbb391 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37871,7 +38241,7 @@ index a1618fa38d5e..9969fddbb391 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -37958,16 +38328,17 @@ index a1618fa38d5e..9969fddbb391 100644
  
  Library("rtc_sdp_video_format_utils_gn")
 diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index 077f256b7ae4..1fce89407712 100644
+index f85bf767992c..a8cd8eb80813 100644
 --- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -37983,7 +38354,7 @@ index 077f256b7ae4..1fce89407712 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38079,7 +38450,7 @@ index 077f256b7ae4..1fce89407712 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38166,16 +38537,17 @@ index 077f256b7ae4..1fce89407712 100644
  
  Library("rtc_simulcast_encoder_adapter_gn")
 diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build
-index 718787db4fdc..148d2e911e47 100644
+index f54114bbfb3a..8f094a671433 100644
 --- third_party/libwebrtc/media/rtp_utils_gn/moz.build
 +++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -38191,7 +38563,7 @@ index 718787db4fdc..148d2e911e47 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38275,7 +38647,7 @@ index 718787db4fdc..148d2e911e47 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38301,7 +38673,7 @@ index 718787db4fdc..148d2e911e47 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -38343,16 +38715,17 @@ index 718787db4fdc..148d2e911e47 100644
 -
  Library("rtp_utils_gn")
 diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build
-index 54aeb0b59974..af579ccfc539 100644
+index 3a23e086ef18..8b7b0aefbf7f 100644
 --- third_party/libwebrtc/media/stream_params_gn/moz.build
 +++ third_party/libwebrtc/media/stream_params_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -38368,7 +38741,7 @@ index 54aeb0b59974..af579ccfc539 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38452,7 +38825,7 @@ index 54aeb0b59974..af579ccfc539 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38478,7 +38851,7 @@ index 54aeb0b59974..af579ccfc539 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -38520,16 +38893,17 @@ index 54aeb0b59974..af579ccfc539 100644
 -
  Library("stream_params_gn")
 diff --git third_party/libwebrtc/media/video_adapter_gn/moz.build third_party/libwebrtc/media/video_adapter_gn/moz.build
-index b69a51a5983d..ededc9780d49 100644
+index 53f223fd0813..e770c100c591 100644
 --- third_party/libwebrtc/media/video_adapter_gn/moz.build
 +++ third_party/libwebrtc/media/video_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -38545,7 +38919,7 @@ index b69a51a5983d..ededc9780d49 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38640,7 +39014,7 @@ index b69a51a5983d..ededc9780d49 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38727,16 +39101,17 @@ index b69a51a5983d..ededc9780d49 100644
  
  Library("video_adapter_gn")
 diff --git third_party/libwebrtc/media/video_broadcaster_gn/moz.build third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-index f615256ba4ed..c1f7fc585462 100644
+index 842dbd0b36da..e82e1420f2d1 100644
 --- third_party/libwebrtc/media/video_broadcaster_gn/moz.build
 +++ third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -38752,7 +39127,7 @@ index f615256ba4ed..c1f7fc585462 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38847,7 +39222,7 @@ index f615256ba4ed..c1f7fc585462 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -38934,16 +39309,17 @@ index f615256ba4ed..c1f7fc585462 100644
  
  Library("video_broadcaster_gn")
 diff --git third_party/libwebrtc/media/video_common_gn/moz.build third_party/libwebrtc/media/video_common_gn/moz.build
-index 8fe45f5a5bd6..cea55451b02a 100644
+index 3f49c8520074..b7af18e892e5 100644
 --- third_party/libwebrtc/media/video_common_gn/moz.build
 +++ third_party/libwebrtc/media/video_common_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -38959,7 +39335,7 @@ index 8fe45f5a5bd6..cea55451b02a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39054,7 +39430,7 @@ index 8fe45f5a5bd6..cea55451b02a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39141,16 +39517,17 @@ index 8fe45f5a5bd6..cea55451b02a 100644
  
  Library("video_common_gn")
 diff --git third_party/libwebrtc/media/video_source_base_gn/moz.build third_party/libwebrtc/media/video_source_base_gn/moz.build
-index 0c67351e481a..b7102601a5f8 100644
+index 0c57675e50ca..02f91f7eb002 100644
 --- third_party/libwebrtc/media/video_source_base_gn/moz.build
 +++ third_party/libwebrtc/media/video_source_base_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -39166,7 +39543,7 @@ index 0c67351e481a..b7102601a5f8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39261,7 +39638,7 @@ index 0c67351e481a..b7102601a5f8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39348,16 +39725,17 @@ index 0c67351e481a..b7102601a5f8 100644
  
  Library("video_source_base_gn")
 diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-index 910b12a46a63..9220db367d82 100644
+index ee8438df8544..e5a19b5feb8a 100644
 --- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -39373,7 +39751,7 @@ index 910b12a46a63..9220db367d82 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39468,7 +39846,7 @@ index 910b12a46a63..9220db367d82 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39555,16 +39933,17 @@ index 910b12a46a63..9220db367d82 100644
  
  Library("async_audio_processing_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index 9c56b76d17a5..442c62b648b5 100644
+index 507a0c82ad18..7f9046c01df4 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -39580,7 +39959,7 @@ index 9c56b76d17a5..442c62b648b5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39675,7 +40054,7 @@ index 9c56b76d17a5..442c62b648b5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39762,16 +40141,17 @@ index 9c56b76d17a5..442c62b648b5 100644
  
  Library("audio_coding_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index 489b534c2fb3..7a4d82a43b5e 100644
+index d9a4aaaecc9e..0439aa74c78f 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -39787,7 +40167,7 @@ index 489b534c2fb3..7a4d82a43b5e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39871,7 +40251,7 @@ index 489b534c2fb3..7a4d82a43b5e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -39897,7 +40277,7 @@ index 489b534c2fb3..7a4d82a43b5e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -39939,16 +40319,17 @@ index 489b534c2fb3..7a4d82a43b5e 100644
 -
  Library("audio_coding_module_typedefs_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index 28a4474f3b01..c44eaba16b4e 100644
+index d6a177e4a1df..3a74c65f54c5 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -39964,7 +40345,7 @@ index 28a4474f3b01..c44eaba16b4e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40059,7 +40440,7 @@ index 28a4474f3b01..c44eaba16b4e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40146,16 +40527,17 @@ index 28a4474f3b01..c44eaba16b4e 100644
  
  Library("audio_coding_opus_common_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index c334503506ad..d0c66e82a230 100644
+index 029e63f3adc6..4ff022aa1bf7 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -40171,7 +40553,7 @@ index c334503506ad..d0c66e82a230 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40266,7 +40648,7 @@ index c334503506ad..d0c66e82a230 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40353,16 +40735,17 @@ index c334503506ad..d0c66e82a230 100644
  
  Library("audio_encoder_cng_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index a8342784a2e6..9b789e0e576c 100644
+index 20606118b736..1228e2b37409 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -40378,7 +40761,7 @@ index a8342784a2e6..9b789e0e576c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40462,7 +40845,7 @@ index a8342784a2e6..9b789e0e576c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40549,16 +40932,17 @@ index a8342784a2e6..9b789e0e576c 100644
  
  Library("audio_network_adaptor_config_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index 98b4ab3b43dc..ccae536ad564 100644
+index c6133dffb1c5..3b37956886c1 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -40574,7 +40958,7 @@ index 98b4ab3b43dc..ccae536ad564 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40669,7 +41053,7 @@ index 98b4ab3b43dc..ccae536ad564 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40756,16 +41140,17 @@ index 98b4ab3b43dc..ccae536ad564 100644
  
  Library("audio_network_adaptor_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index b83a1cfcfb20..131a60705075 100644
+index 3d0f9efa7cc7..b06fb7931b65 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -40781,7 +41166,7 @@ index b83a1cfcfb20..131a60705075 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40865,7 +41250,7 @@ index b83a1cfcfb20..131a60705075 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -40952,16 +41337,17 @@ index b83a1cfcfb20..131a60705075 100644
  
  Library("g711_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index 1675e90d8790..d01e4b686418 100644
+index 4c6b301e7dd8..6f557d5bee52 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -40977,7 +41363,7 @@ index 1675e90d8790..d01e4b686418 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41072,7 +41458,7 @@ index 1675e90d8790..d01e4b686418 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41159,16 +41545,17 @@ index 1675e90d8790..d01e4b686418 100644
  
  Library("g711_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index fa99447ca050..44978ebedb1d 100644
+index a239eacbc072..5161c658fa97 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -41184,7 +41571,7 @@ index fa99447ca050..44978ebedb1d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41268,7 +41655,7 @@ index fa99447ca050..44978ebedb1d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41355,16 +41742,17 @@ index fa99447ca050..44978ebedb1d 100644
  
  Library("g722_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index fa074502a127..4f9ad9cd4a62 100644
+index f53505759de2..0e14afa75bea 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -41380,7 +41768,7 @@ index fa074502a127..4f9ad9cd4a62 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41475,7 +41863,7 @@ index fa074502a127..4f9ad9cd4a62 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41562,16 +41950,17 @@ index fa074502a127..4f9ad9cd4a62 100644
  
  Library("g722_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index deddbd7bc6a3..279051a8188f 100644
+index d8d0a53699a2..5deeab00d8bd 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -41587,7 +41976,7 @@ index deddbd7bc6a3..279051a8188f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41671,7 +42060,7 @@ index deddbd7bc6a3..279051a8188f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41697,7 +42086,7 @@ index deddbd7bc6a3..279051a8188f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -41739,16 +42128,17 @@ index deddbd7bc6a3..279051a8188f 100644
 -
  Library("isac_bwinfo_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index 9a2813ef474b..975128b1fe25 100644
+index 50e6c6a0c6bf..a73dff4e7514 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -41764,7 +42154,7 @@ index 9a2813ef474b..975128b1fe25 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,82 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,82 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41848,7 +42238,7 @@ index 9a2813ef474b..975128b1fe25 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -132,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -133,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -41935,16 +42325,17 @@ index 9a2813ef474b..975128b1fe25 100644
  
  Library("isac_vad_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index 68845ebff19a..1463a804bbff 100644
+index 97db9c0c5cc9..e0ee21154e25 100644
 --- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -41960,7 +42351,7 @@ index 68845ebff19a..1463a804bbff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42055,7 +42446,7 @@ index 68845ebff19a..1463a804bbff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42142,16 +42533,17 @@ index 68845ebff19a..1463a804bbff 100644
  
  Library("legacy_encoded_audio_frame_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-index e95df08fe2f1..279a75344bbd 100644
+index 48f04655a416..9071d05a3847 100644
 --- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -42167,7 +42559,7 @@ index e95df08fe2f1..279a75344bbd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -80,93 +89,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -81,93 +90,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42262,7 +42654,7 @@ index e95df08fe2f1..279a75344bbd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -174,82 +97,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -175,82 +98,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42320,10 +42712,10 @@ index e95df08fe2f1..279a75344bbd 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -42334,10 +42726,10 @@ index e95df08fe2f1..279a75344bbd 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -42349,16 +42741,17 @@ index e95df08fe2f1..279a75344bbd 100644
  
  Library("neteq_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index 1f9fc4f74a1a..8dfe667be13c 100644
+index ed59090a2737..3bdb558214e0 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -42374,7 +42767,7 @@ index 1f9fc4f74a1a..8dfe667be13c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42458,7 +42851,7 @@ index 1f9fc4f74a1a..8dfe667be13c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42545,16 +42938,17 @@ index 1f9fc4f74a1a..8dfe667be13c 100644
  
  Library("pcm16b_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index db4b694011a3..8abc614eedbe 100644
+index 24ad51e729ff..2f85c4fefd22 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -42570,7 +42964,7 @@ index db4b694011a3..8abc614eedbe 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42665,7 +43059,7 @@ index db4b694011a3..8abc614eedbe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42752,16 +43146,17 @@ index db4b694011a3..8abc614eedbe 100644
  
  Library("pcm16b_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index 7896cb765a18..f16ef0cde7d2 100644
+index f33600148604..ed6ea700945f 100644
 --- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -42777,7 +43172,7 @@ index 7896cb765a18..f16ef0cde7d2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42872,7 +43267,7 @@ index 7896cb765a18..f16ef0cde7d2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -42959,16 +43354,17 @@ index 7896cb765a18..f16ef0cde7d2 100644
  
  Library("red_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index d81c924c7314..bf58ee8f6ccc 100644
+index c8a19b987eaa..ee990f9a98d4 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -42984,7 +43380,7 @@ index d81c924c7314..bf58ee8f6ccc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43072,7 +43468,7 @@ index d81c924c7314..bf58ee8f6ccc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43159,7 +43555,7 @@ index d81c924c7314..bf58ee8f6ccc 100644
  
  Library("webrtc_cng_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index c79834bb21b0..1d99ea5b574c 100644
+index 0037cf5e11ab..a12c8d2f5179 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
 @@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43170,9 +43566,9 @@ index c79834bb21b0..1d99ea5b574c 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_CODEC_OPUS"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+@@ -21,7 +24,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
  DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -43186,7 +43582,7 @@ index c79834bb21b0..1d99ea5b574c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43281,7 +43677,7 @@ index c79834bb21b0..1d99ea5b574c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43368,7 +43764,7 @@ index c79834bb21b0..1d99ea5b574c 100644
  
  Library("webrtc_multiopus_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index 359c64bca323..ca89800b1f98 100644
+index a495d917a366..90a60f628736 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 @@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43379,9 +43775,9 @@ index 359c64bca323..ca89800b1f98 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_CODEC_OPUS"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+@@ -21,7 +24,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
  DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -43395,7 +43791,7 @@ index 359c64bca323..ca89800b1f98 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43490,7 +43886,7 @@ index 359c64bca323..ca89800b1f98 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43577,7 +43973,7 @@ index 359c64bca323..ca89800b1f98 100644
  
  Library("webrtc_opus_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index e255da9f0e5d..cbdb8e61184f 100644
+index baa5776b00c8..b6e2034a8800 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
 @@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -43588,9 +43984,9 @@ index e255da9f0e5d..cbdb8e61184f 100644
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
  DEFINES["WEBRTC_CODEC_OPUS"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
-@@ -20,7 +23,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+@@ -21,7 +24,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
  DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
@@ -43604,7 +44000,7 @@ index e255da9f0e5d..cbdb8e61184f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,86 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43692,7 +44088,7 @@ index e255da9f0e5d..cbdb8e61184f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43779,16 +44175,17 @@ index e255da9f0e5d..cbdb8e61184f 100644
  
  Library("webrtc_opus_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index 32a52b9ad4dc..1812ab6bedf8 100644
+index a5c93a18341a..c2caf57806a2 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -43804,7 +44201,7 @@ index 32a52b9ad4dc..1812ab6bedf8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43888,7 +44285,7 @@ index 32a52b9ad4dc..1812ab6bedf8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -43914,7 +44311,7 @@ index 32a52b9ad4dc..1812ab6bedf8 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -43956,16 +44353,17 @@ index 32a52b9ad4dc..1812ab6bedf8 100644
 -
  Library("audio_device_gn")
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index 84025f54a42e..67a9ba3e660f 100644
+index 6a9eba4ab9c7..eaec7997cbd5 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -43981,7 +44379,7 @@ index 84025f54a42e..67a9ba3e660f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44076,7 +44474,7 @@ index 84025f54a42e..67a9ba3e660f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44163,10 +44561,10 @@ index 84025f54a42e..67a9ba3e660f 100644
  
  Library("audio_frame_manipulator_gn")
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index 266eeae7423d..29d13fa8a836 100644
+index e79bf298085d..0a2b95bc4e9c 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -44174,6 +44572,7 @@ index 266eeae7423d..29d13fa8a836 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -44189,7 +44588,7 @@ index 266eeae7423d..29d13fa8a836 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44284,7 +44683,7 @@ index 266eeae7423d..29d13fa8a836 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44371,16 +44770,17 @@ index 266eeae7423d..29d13fa8a836 100644
  
  Library("audio_mixer_impl_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index 67dbd0364954..af1781edae5a 100644
+index 5baea17a1886..292760f2e639 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -44396,7 +44796,7 @@ index 67dbd0364954..af1781edae5a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44415,10 +44815,6 @@ index 67dbd0364954..af1781edae5a 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -44484,7 +44880,7 @@ index 67dbd0364954..af1781edae5a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44510,7 +44906,7 @@ index 67dbd0364954..af1781edae5a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -44552,16 +44948,17 @@ index 67dbd0364954..af1781edae5a 100644
 -
  Library("adaptive_fir_filter_erl_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index 826757be30b2..248e97af3f24 100644
+index 583bd4786540..45666ddb0617 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -44577,7 +44974,7 @@ index 826757be30b2..248e97af3f24 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44672,7 +45069,7 @@ index 826757be30b2..248e97af3f24 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -44698,7 +45095,7 @@ index 826757be30b2..248e97af3f24 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -44740,10 +45137,10 @@ index 826757be30b2..248e97af3f24 100644
 -
  Library("adaptive_fir_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index 841514fe7c05..07f83ec4dd88 100644
+index 6888d3c806c6..1174a48c8026 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-@@ -18,14 +18,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,7 +18,10 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -44751,9 +45148,10 @@ index 841514fe7c05..07f83ec4dd88 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -26,7 +29,13 @@ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -44767,7 +45165,7 @@ index 841514fe7c05..07f83ec4dd88 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,122 +66,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,122 +67,9 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44892,16 +45290,17 @@ index 841514fe7c05..07f83ec4dd88 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_block_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_block_gn/moz.build
-index 3bedcf81dd5c..b0c94886e2f8 100644
+index a8c964679056..b093378e1a28 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_block_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_block_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -44917,7 +45316,7 @@ index 3bedcf81dd5c..b0c94886e2f8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44936,10 +45335,6 @@ index 3bedcf81dd5c..b0c94886e2f8 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -45005,7 +45400,7 @@ index 3bedcf81dd5c..b0c94886e2f8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45031,7 +45426,7 @@ index 3bedcf81dd5c..b0c94886e2f8 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -45073,16 +45468,17 @@ index 3bedcf81dd5c..b0c94886e2f8 100644
 -
  Library("aec3_block_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index 8ee5cb9e07a8..87efd357dcbd 100644
+index 57b8c0b8f161..1fb0e3aec107 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -45098,7 +45494,7 @@ index 8ee5cb9e07a8..87efd357dcbd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45182,7 +45578,7 @@ index 8ee5cb9e07a8..87efd357dcbd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45208,7 +45604,7 @@ index 8ee5cb9e07a8..87efd357dcbd 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -45250,16 +45646,17 @@ index 8ee5cb9e07a8..87efd357dcbd 100644
 -
  Library("aec3_common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index 0a4f5b6f98bf..2f6d1401854f 100644
+index 1b8c37c920f0..15a7d5f234d0 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -45275,7 +45672,7 @@ index 0a4f5b6f98bf..2f6d1401854f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45370,7 +45767,7 @@ index 0a4f5b6f98bf..2f6d1401854f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45396,7 +45793,7 @@ index 0a4f5b6f98bf..2f6d1401854f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -45438,10 +45835,10 @@ index 0a4f5b6f98bf..2f6d1401854f 100644
 -
  Library("aec3_fft_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index 7ba40bca2b1a..ab0e74825f70 100644
+index 343af93b922b..303fe3992098 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -45449,6 +45846,7 @@ index 7ba40bca2b1a..ab0e74825f70 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -45464,7 +45862,7 @@ index 7ba40bca2b1a..ab0e74825f70 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -103,93 +112,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -104,93 +113,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45559,7 +45957,7 @@ index 7ba40bca2b1a..ab0e74825f70 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -197,82 +120,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -198,82 +121,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45646,16 +46044,17 @@ index 7ba40bca2b1a..ab0e74825f70 100644
  
  Library("aec3_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index f65afa9ac2f6..46165a8d7f41 100644
+index ec3384867f5e..5a86e66d6273 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -45671,7 +46070,7 @@ index f65afa9ac2f6..46165a8d7f41 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45759,7 +46158,7 @@ index f65afa9ac2f6..46165a8d7f41 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45785,7 +46184,7 @@ index f65afa9ac2f6..46165a8d7f41 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -45827,16 +46226,17 @@ index f65afa9ac2f6..46165a8d7f41 100644
 -
  Library("fft_data_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index 511f5e83ffca..803c26a3f14e 100644
+index 4ca49a8cd44a..7d2cd991a2e4 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -45852,7 +46252,7 @@ index 511f5e83ffca..803c26a3f14e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45871,10 +46271,6 @@ index 511f5e83ffca..803c26a3f14e 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -45940,7 +46336,7 @@ index 511f5e83ffca..803c26a3f14e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -45966,7 +46362,7 @@ index 511f5e83ffca..803c26a3f14e 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46008,16 +46404,17 @@ index 511f5e83ffca..803c26a3f14e 100644
 -
  Library("matched_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index dd3a8042526c..a61dbeb42dac 100644
+index e0155a62f914..1a66547b763f 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -46033,7 +46430,7 @@ index dd3a8042526c..a61dbeb42dac 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46121,7 +46518,7 @@ index dd3a8042526c..a61dbeb42dac 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46147,7 +46544,7 @@ index dd3a8042526c..a61dbeb42dac 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46189,16 +46586,17 @@ index dd3a8042526c..a61dbeb42dac 100644
 -
  Library("render_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index 1a8f09ed9c10..4ebff1919c6f 100644
+index 8f8d46a3f6c7..0f63e9a896b5 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -46214,7 +46612,7 @@ index 1a8f09ed9c10..4ebff1919c6f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46302,7 +46700,7 @@ index 1a8f09ed9c10..4ebff1919c6f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46328,7 +46726,7 @@ index 1a8f09ed9c10..4ebff1919c6f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46370,16 +46768,17 @@ index 1a8f09ed9c10..4ebff1919c6f 100644
 -
  Library("vector_math_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index 0fc8981378df..411bcb480900 100644
+index 02c2a097723c..3440e86da45e 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -46395,7 +46794,7 @@ index 0fc8981378df..411bcb480900 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46490,7 +46889,7 @@ index 0fc8981378df..411bcb480900 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46516,7 +46915,7 @@ index 0fc8981378df..411bcb480900 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -46558,16 +46957,17 @@ index 0fc8981378df..411bcb480900 100644
 -
  Library("aec_dump_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index 8856ebd34b1d..58073c04a13f 100644
+index 0ef019f3c105..9f5c5e5e2677 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -46583,7 +46983,7 @@ index 8856ebd34b1d..58073c04a13f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46678,7 +47078,7 @@ index 8856ebd34b1d..58073c04a13f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46765,16 +47165,17 @@ index 8856ebd34b1d..58073c04a13f 100644
  
  Library("null_aec_dump_factory_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 27439b35bb70..02b5f3aa25f7 100644
+index 1dac1b89d0ea..a19f251853b3 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -46790,7 +47191,7 @@ index 27439b35bb70..02b5f3aa25f7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46885,7 +47286,7 @@ index 27439b35bb70..02b5f3aa25f7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -46971,270 +47372,11 @@ index 27439b35bb70..02b5f3aa25f7 100644
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
  Library("aec_dump_interface_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index 60d496606730..f7b819222e3d 100644
---- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "xul"
- 
-@@ -47,102 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--    OS_LIBS += [
--        "log"
--    ]
--
--    SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
--    ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--    SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--    SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
--    ]
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
--    DEFINES["__STD_C"] = True
--
--    SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
--    ]
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-@@ -151,27 +65,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["__ARM_NEON__"] = "1"
- 
-     SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
--    ]
--
--if CONFIG["TARGET_CPU"] == "arm":
--
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
--    SOURCES += [
-+        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc",
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
-     ]
- 
- if CONFIG["TARGET_CPU"] == "loongarch64":
- 
--    DEFINES["_GNU_SOURCE"] = True
--
-     SOURCES += [
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
-     ]
-@@ -180,7 +79,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
--    DEFINES["_GNU_SOURCE"] = True
- 
-     SOURCES += [
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc"
-@@ -188,8 +86,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
- 
- if CONFIG["TARGET_CPU"] == "mips64":
- 
--    DEFINES["_GNU_SOURCE"] = True
--
-     SOURCES += [
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
-     ]
-@@ -200,77 +96,27 @@ if CONFIG["TARGET_CPU"] == "ppc64":
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
-     ]
- 
--if CONFIG["TARGET_CPU"] == "x86":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--    SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["TARGET_CPU"] == "riscv64":
- 
-     SOURCES += [
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
-     ]
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
--
--    SOURCES += [
--        "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
-     SOURCES += [
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
-     ]
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
-     SOURCES += [
-         "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
 diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index b3eada70e070..1e05f9215cb7 100644
+index cfc8e1cf4cce..035dcca36b17 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -47242,6 +47384,7 @@ index b3eada70e070..1e05f9215cb7 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -47257,7 +47400,7 @@ index b3eada70e070..1e05f9215cb7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47352,7 +47495,7 @@ index b3eada70e070..1e05f9215cb7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -47439,16 +47582,17 @@ index b3eada70e070..1e05f9215cb7 100644
  
  Library("agc_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index 8e992e81b365..04869edc3c5f 100644
+index fa3a0b713380..c83d7132bb51 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -47464,7 +47608,7 @@ index 8e992e81b365..04869edc3c5f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47548,7 +47692,7 @@ index 8e992e81b365..04869edc3c5f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -47574,7 +47718,7 @@ index 8e992e81b365..04869edc3c5f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -47616,16 +47760,17 @@ index 8e992e81b365..04869edc3c5f 100644
 -
  Library("gain_control_interface_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index 5cb20550eb9b..63d3222f12fc 100644
+index 715959be272f..db58384d11b3 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -47641,7 +47786,7 @@ index 5cb20550eb9b..63d3222f12fc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47736,7 +47881,7 @@ index 5cb20550eb9b..63d3222f12fc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -47823,16 +47968,17 @@ index 5cb20550eb9b..63d3222f12fc 100644
  
  Library("legacy_agc_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index 60bc520f030d..3539b6f3f359 100644
+index 26cb25a081e9..eb9d1d0e579a 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -47848,7 +47994,7 @@ index 60bc520f030d..3539b6f3f359 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47943,7 +48089,7 @@ index 60bc520f030d..3539b6f3f359 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48030,10 +48176,10 @@ index 60bc520f030d..3539b6f3f359 100644
  
  Library("level_estimation_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-index 2330433745f4..f613f26874c6 100644
+index ce4382a02519..d9cf34036e50 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -48041,6 +48187,7 @@ index 2330433745f4..f613f26874c6 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -48056,7 +48203,7 @@ index 2330433745f4..f613f26874c6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48151,7 +48298,7 @@ index 2330433745f4..f613f26874c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48238,16 +48385,17 @@ index 2330433745f4..f613f26874c6 100644
  
  Library("adaptive_digital_gain_controller_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index d5c67b371823..3092974ef246 100644
+index b0c74cb4311b..43bbcd0e6d49 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -48263,7 +48411,7 @@ index d5c67b371823..3092974ef246 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48351,7 +48499,7 @@ index d5c67b371823..3092974ef246 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48438,16 +48586,17 @@ index d5c67b371823..3092974ef246 100644
  
  Library("biquad_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-index 667b65137559..2f73f17c2555 100644
+index ccb5a09b086f..081f3a4d80f0 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -48463,7 +48612,7 @@ index 667b65137559..2f73f17c2555 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48558,7 +48707,7 @@ index 667b65137559..2f73f17c2555 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48645,16 +48794,17 @@ index 667b65137559..2f73f17c2555 100644
  
  Library("clipping_predictor_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index e1a0baae554c..9b86a297b3bf 100644
+index 4b187a3a182f..58074d6889cb 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -48670,7 +48820,7 @@ index e1a0baae554c..9b86a297b3bf 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48754,7 +48904,7 @@ index e1a0baae554c..9b86a297b3bf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -48780,7 +48930,7 @@ index e1a0baae554c..9b86a297b3bf 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -48822,16 +48972,17 @@ index e1a0baae554c..9b86a297b3bf 100644
 -
  Library("common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-index be4610aa0cf4..95ae3f5c0f93 100644
+index eebcfa8c41e0..b9813ff1b7de 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -48847,7 +48998,7 @@ index be4610aa0cf4..95ae3f5c0f93 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48942,7 +49093,7 @@ index be4610aa0cf4..95ae3f5c0f93 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49029,10 +49180,10 @@ index be4610aa0cf4..95ae3f5c0f93 100644
  
  Library("cpu_features_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index 2e53dee9e378..3d538b54dcb6 100644
+index c2372b3f623b..d60d4e33a808 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -49040,6 +49191,7 @@ index 2e53dee9e378..3d538b54dcb6 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -49055,7 +49207,7 @@ index 2e53dee9e378..3d538b54dcb6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49150,7 +49302,7 @@ index 2e53dee9e378..3d538b54dcb6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49237,16 +49389,17 @@ index 2e53dee9e378..3d538b54dcb6 100644
  
  Library("fixed_digital_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index 0301076b89fd..7fc8cd8541ce 100644
+index a03a3707f334..491f0c74ce5a 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -49262,7 +49415,7 @@ index 0301076b89fd..7fc8cd8541ce 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49357,7 +49510,7 @@ index 0301076b89fd..7fc8cd8541ce 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49444,16 +49597,17 @@ index 0301076b89fd..7fc8cd8541ce 100644
  
  Library("gain_applier_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-index fc03d1e950c9..925eefbff872 100644
+index c697c27a0ce8..a08f66b6bad2 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -49469,7 +49623,7 @@ index fc03d1e950c9..925eefbff872 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49553,7 +49707,7 @@ index fc03d1e950c9..925eefbff872 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49579,7 +49733,7 @@ index fc03d1e950c9..925eefbff872 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -49621,10 +49775,10 @@ index fc03d1e950c9..925eefbff872 100644
 -
  Library("gain_map_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-index 3312eb9b2687..7475d4f5fcc9 100644
+index 2b0809631ea1..c5a26d6f1358 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -49632,6 +49786,7 @@ index 3312eb9b2687..7475d4f5fcc9 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -49647,7 +49802,7 @@ index 3312eb9b2687..7475d4f5fcc9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49742,7 +49897,7 @@ index 3312eb9b2687..7475d4f5fcc9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -49829,16 +49984,17 @@ index 3312eb9b2687..7475d4f5fcc9 100644
  
  Library("input_volume_controller_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-index eeb45cb8db7a..767564b38e70 100644
+index 816c0921b9f9..9fd99822b99e 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -49854,7 +50010,7 @@ index eeb45cb8db7a..767564b38e70 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49949,7 +50105,7 @@ index eeb45cb8db7a..767564b38e70 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50036,10 +50192,10 @@ index eeb45cb8db7a..767564b38e70 100644
  
  Library("input_volume_stats_reporter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index 78a1ea36bea8..aef58f171a81 100644
+index c5948680fd65..2386e652cbc7 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -50047,6 +50203,7 @@ index 78a1ea36bea8..aef58f171a81 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -50062,7 +50219,7 @@ index 78a1ea36bea8..aef58f171a81 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50157,7 +50314,7 @@ index 78a1ea36bea8..aef58f171a81 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50244,16 +50401,17 @@ index 78a1ea36bea8..aef58f171a81 100644
  
  Library("noise_level_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-index 1de463d8cf15..590703ff90d7 100644
+index e80978e5cdaf..09d4146ea8f1 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -50269,7 +50427,7 @@ index 1de463d8cf15..590703ff90d7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50364,7 +50522,7 @@ index 1de463d8cf15..590703ff90d7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50451,16 +50609,17 @@ index 1de463d8cf15..590703ff90d7 100644
  
  Library("rnn_vad_auto_correlation_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-index 570b4d1a7bb2..77b99ab85ab7 100644
+index 1c2f9ab1c01f..07edd1aa9d7c 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -50476,7 +50635,7 @@ index 570b4d1a7bb2..77b99ab85ab7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50571,7 +50730,7 @@ index 570b4d1a7bb2..77b99ab85ab7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50597,7 +50756,7 @@ index 570b4d1a7bb2..77b99ab85ab7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -50639,16 +50798,17 @@ index 570b4d1a7bb2..77b99ab85ab7 100644
 -
  Library("rnn_vad_common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index 73cf1d07a5c3..7b7869c1cc0f 100644
+index c863dcef01bf..b8a40a793232 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -50664,7 +50824,7 @@ index 73cf1d07a5c3..7b7869c1cc0f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50759,7 +50919,7 @@ index 73cf1d07a5c3..7b7869c1cc0f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -50846,16 +51006,17 @@ index 73cf1d07a5c3..7b7869c1cc0f 100644
  
  Library("rnn_vad_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-index efb1ea3b48bb..784bf34261ff 100644
+index 391cfeba55f4..7a1873183c70 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -50871,7 +51032,7 @@ index efb1ea3b48bb..784bf34261ff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50966,7 +51127,7 @@ index efb1ea3b48bb..784bf34261ff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51053,16 +51214,17 @@ index efb1ea3b48bb..784bf34261ff 100644
  
  Library("rnn_vad_layers_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-index 4fefa7795aa0..9b8a2d18952e 100644
+index e4eb3ba4aa0d..ccbc575bc520 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -51078,7 +51240,7 @@ index 4fefa7795aa0..9b8a2d18952e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51166,7 +51328,7 @@ index 4fefa7795aa0..9b8a2d18952e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51253,16 +51415,17 @@ index 4fefa7795aa0..9b8a2d18952e 100644
  
  Library("rnn_vad_lp_residual_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-index e5b6ee12a51f..bb89272d797c 100644
+index 377f759bcd98..b30c2d06c68b 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -51278,7 +51441,7 @@ index e5b6ee12a51f..bb89272d797c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51373,7 +51536,7 @@ index e5b6ee12a51f..bb89272d797c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51460,16 +51623,17 @@ index e5b6ee12a51f..bb89272d797c 100644
  
  Library("rnn_vad_pitch_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-index 4375c115591f..de7a77543eb5 100644
+index a6bf544394fb..c88f0eaacfc1 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -51485,7 +51649,7 @@ index 4375c115591f..de7a77543eb5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51573,7 +51737,7 @@ index 4375c115591f..de7a77543eb5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51599,7 +51763,7 @@ index 4375c115591f..de7a77543eb5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -51641,16 +51805,17 @@ index 4375c115591f..de7a77543eb5 100644
 -
  Library("rnn_vad_ring_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-index 3fb4fa37a59d..a2ec0e64002f 100644
+index b6a617ed9a96..0f451d548c44 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -51666,7 +51831,7 @@ index 3fb4fa37a59d..a2ec0e64002f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51754,7 +51919,7 @@ index 3fb4fa37a59d..a2ec0e64002f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -51780,7 +51945,7 @@ index 3fb4fa37a59d..a2ec0e64002f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -51822,16 +51987,17 @@ index 3fb4fa37a59d..a2ec0e64002f 100644
 -
  Library("rnn_vad_sequence_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-index cf0ed3ecaf31..611573ee4186 100644
+index 43938e24b95d..ff5d90af56ac 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -51847,7 +52013,7 @@ index cf0ed3ecaf31..611573ee4186 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51942,7 +52108,7 @@ index cf0ed3ecaf31..611573ee4186 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52029,16 +52195,17 @@ index cf0ed3ecaf31..611573ee4186 100644
  
  Library("rnn_vad_spectral_features_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-index e0efdff86364..d3eef1484e27 100644
+index df2a7efa8099..cf914de003f9 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -52054,7 +52221,7 @@ index e0efdff86364..d3eef1484e27 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52142,7 +52309,7 @@ index e0efdff86364..d3eef1484e27 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52168,7 +52335,7 @@ index e0efdff86364..d3eef1484e27 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -52210,19 +52377,20 @@ index e0efdff86364..d3eef1484e27 100644
 -
  Library("rnn_vad_symmetric_matrix_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-index 67d0bfcbe14d..9df5c4c6c530 100644
+index b490f7098db7..acd050036c23 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,6 +18,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -25,7 +28,13 @@ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -52236,7 +52404,7 @@ index 67d0bfcbe14d..9df5c4c6c530 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,122 +61,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,122 +62,9 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52361,16 +52529,17 @@ index 67d0bfcbe14d..9df5c4c6c530 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-index f7c42e9e9d61..4ebff1919c6f 100644
+index 2cc163c01c0b..0f63e9a896b5 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -52386,7 +52555,7 @@ index f7c42e9e9d61..4ebff1919c6f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52481,7 +52650,7 @@ index f7c42e9e9d61..4ebff1919c6f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52507,7 +52676,7 @@ index f7c42e9e9d61..4ebff1919c6f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -52549,10 +52718,10 @@ index f7c42e9e9d61..4ebff1919c6f 100644
 -
  Library("vector_math_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-index 1bdd827e45aa..fde13760ef04 100644
+index 40a71bc89ec9..9f8e73a277c6 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -52560,6 +52729,7 @@ index 1bdd827e45aa..fde13760ef04 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -52575,7 +52745,7 @@ index 1bdd827e45aa..fde13760ef04 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52670,7 +52840,7 @@ index 1bdd827e45aa..fde13760ef04 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52757,10 +52927,10 @@ index 1bdd827e45aa..fde13760ef04 100644
  
  Library("saturation_protector_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-index d525a1e5b3cf..da85e317d031 100644
+index 7d60dd33ced1..f88ad6725035 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -52768,6 +52938,7 @@ index d525a1e5b3cf..da85e317d031 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -52783,7 +52954,7 @@ index d525a1e5b3cf..da85e317d031 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,93 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52878,7 +53049,7 @@ index d525a1e5b3cf..da85e317d031 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -146,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -52965,16 +53136,17 @@ index d525a1e5b3cf..da85e317d031 100644
  
  Library("speech_level_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-index 88f39d6c59ae..1c7395007405 100644
+index 92860ca86d3d..947083703682 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -52990,7 +53162,7 @@ index 88f39d6c59ae..1c7395007405 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53085,7 +53257,7 @@ index 88f39d6c59ae..1c7395007405 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53172,10 +53344,10 @@ index 88f39d6c59ae..1c7395007405 100644
  
  Library("vad_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index 9cf92bd2a934..998b3c95ab71 100644
+index 65f4af2f6f8e..4d2b4ffbc680 100644
 --- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -53183,6 +53355,7 @@ index 9cf92bd2a934..998b3c95ab71 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -53198,7 +53371,7 @@ index 9cf92bd2a934..998b3c95ab71 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53293,7 +53466,7 @@ index 9cf92bd2a934..998b3c95ab71 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53380,10 +53553,10 @@ index 9cf92bd2a934..998b3c95ab71 100644
  
  Library("apm_logging_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index 17ed3d672a03..1c1b8d4143d8 100644
+index ee233ae04e22..563f24f886a0 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -53391,6 +53564,7 @@ index 17ed3d672a03..1c1b8d4143d8 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -53406,7 +53580,7 @@ index 17ed3d672a03..1c1b8d4143d8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53501,7 +53675,7 @@ index 17ed3d672a03..1c1b8d4143d8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53588,16 +53762,17 @@ index 17ed3d672a03..1c1b8d4143d8 100644
  
  Library("audio_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index c1c5e0b27d94..b56d3e9d131c 100644
+index c5d7fe6b7328..000bdba07952 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -53613,7 +53788,7 @@ index c1c5e0b27d94..b56d3e9d131c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53708,7 +53883,7 @@ index c1c5e0b27d94..b56d3e9d131c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53795,16 +53970,17 @@ index c1c5e0b27d94..b56d3e9d131c 100644
  
  Library("audio_frame_proxies_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index 1a41d352a6b7..c2d5f48fe19f 100644
+index af893c8620d4..619ac53af4fd 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -53820,7 +53996,7 @@ index 1a41d352a6b7..c2d5f48fe19f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53915,7 +54091,7 @@ index 1a41d352a6b7..c2d5f48fe19f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -53941,7 +54117,7 @@ index 1a41d352a6b7..c2d5f48fe19f 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -53983,10 +54159,10 @@ index 1a41d352a6b7..c2d5f48fe19f 100644
 -
  Library("audio_frame_view_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index cbf16e2d8d5a..7204f516a50d 100644
+index e20511053e8b..3b74e7d4a31a 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -53994,6 +54170,7 @@ index cbf16e2d8d5a..7204f516a50d 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -54191,16 +54368,17 @@ index cbf16e2d8d5a..7204f516a50d 100644
  
  Library("audio_processing_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-index 566fa702e086..8df1dc59bb19 100644
+index 2590aa7a0653..c24cf63d85a7 100644
 --- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -54216,7 +54394,7 @@ index 566fa702e086..8df1dc59bb19 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54311,7 +54489,7 @@ index 566fa702e086..8df1dc59bb19 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54397,18 +54575,18 @@ index 566fa702e086..8df1dc59bb19 100644
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
  Library("capture_levels_adjuster_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-index 52e13f77d65e..2a4fd4b2f230 100644
---- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+diff --git third_party/libwebrtc/modules/audio_processing/capture_mixer/capture_mixer_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_mixer/capture_mixer_gn/moz.build
+index e3661bcce03f..9f0009d718b0 100644
+--- third_party/libwebrtc/modules/audio_processing/capture_mixer/capture_mixer_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/capture_mixer/capture_mixer_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -54424,7 +54602,7 @@ index 52e13f77d65e..2a4fd4b2f230 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,86 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54508,18 +54686,11 @@ index 52e13f77d65e..2a4fd4b2f230 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -140,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54604,18 +54775,20 @@ index 52e13f77d65e..2a4fd4b2f230 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("gain_controller2_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index a1c9ddba74f3..0f0e8130fc1d 100644
---- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("capture_mixer_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+index 2248841be006..0f39a4b8469a 100644
+--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -54631,7 +54804,7 @@ index a1c9ddba74f3..0f0e8130fc1d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54726,7 +54899,7 @@ index a1c9ddba74f3..0f0e8130fc1d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -54811,19 +54984,19 @@ index a1c9ddba74f3..0f0e8130fc1d 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("high_pass_filter_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index 913766a7301e..d7e4306b8748 100644
---- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+ Library("gain_controller2_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
+index 81429e35ad20..9aa2432f7d73 100644
+--- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
 @@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -54839,7 +55012,7 @@ index 913766a7301e..d7e4306b8748 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54934,7 +55107,7 @@ index 913766a7301e..d7e4306b8748 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55019,18 +55192,20 @@ index 913766a7301e..d7e4306b8748 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("ns_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
-index adbf42b91139..595a0ad0d37c 100644
---- third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("high_pass_filter_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+index 3c3dca361b95..043bab4e4a17 100644
+--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -55046,7 +55221,7 @@ index adbf42b91139..595a0ad0d37c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -60,93 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55141,7 +55316,7 @@ index adbf42b91139..595a0ad0d37c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -154,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55226,18 +55401,19 @@ index adbf42b91139..595a0ad0d37c 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("post_filter_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index bcdec468bd11..2c78ef2b8605 100644
---- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("ns_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
+index db41e6cb397c..5e777312db99 100644
+--- third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/post_filter_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -55253,7 +55429,7 @@ index bcdec468bd11..2c78ef2b8605 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55337,11 +55513,18 @@ index bcdec468bd11..2c78ef2b8605 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55426,18 +55609,19 @@ index bcdec468bd11..2c78ef2b8605 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("rms_level_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index d0c4e5e064dc..159e9cf582d7 100644
---- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("post_filter_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+index e12e5295a6da..3572b9a3893d 100644
+--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -55453,7 +55637,7 @@ index d0c4e5e064dc..159e9cf582d7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55541,7 +55725,7 @@ index d0c4e5e064dc..159e9cf582d7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -55626,18 +55810,19 @@ index d0c4e5e064dc..159e9cf582d7 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("cascaded_biquad_filter_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index e56b8a7cc52c..a037bee529b4 100644
---- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("rms_level_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+index 731c8085d198..ea90585deac4 100644
+--- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -55826,18 +56011,19 @@ index e56b8a7cc52c..a037bee529b4 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("legacy_delay_estimator_gn")
+ Library("cascaded_biquad_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index 4d177ba51e76..1352dcf9dd77 100644
+index 793b82cf22cf..090e7a2468fa 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -55853,7 +56039,7 @@ index 4d177ba51e76..1352dcf9dd77 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55941,7 +56127,7 @@ index 4d177ba51e76..1352dcf9dd77 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56028,16 +56214,17 @@ index 4d177ba51e76..1352dcf9dd77 100644
  
  Library("pffft_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index b75e258645f5..47eebf564575 100644
+index 0a46e9cb6907..9e734bcac493 100644
 --- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -56053,7 +56240,7 @@ index b75e258645f5..47eebf564575 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,93 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56148,7 +56335,7 @@ index b75e258645f5..47eebf564575 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56235,16 +56422,17 @@ index b75e258645f5..47eebf564575 100644
  
  Library("vad_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index 3c4421782f08..3db34e302b65 100644
+index 07ac2661dca6..27f6d43d3f54 100644
 --- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -56260,7 +56448,7 @@ index 3c4421782f08..3db34e302b65 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56280,7 +56468,6 @@ index 3c4421782f08..3db34e302b65 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -56356,7 +56543,7 @@ index 3c4421782f08..3db34e302b65 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56443,16 +56630,17 @@ index 3c4421782f08..3db34e302b65 100644
  
  Library("congestion_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index c3eac770d4a4..44e65e3af3dd 100644
+index f82d97c561bc..af8994f4fc78 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -56468,7 +56656,7 @@ index c3eac770d4a4..44e65e3af3dd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56563,7 +56751,7 @@ index c3eac770d4a4..44e65e3af3dd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56650,16 +56838,17 @@ index c3eac770d4a4..44e65e3af3dd 100644
  
  Library("alr_detector_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index 21fff249f2b7..6535a0ec9e81 100644
+index c1114f3e09de..02dabc7b801d 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -56675,7 +56864,7 @@ index 21fff249f2b7..6535a0ec9e81 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56771,7 +56960,7 @@ index 21fff249f2b7..6535a0ec9e81 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -56858,16 +57047,17 @@ index 21fff249f2b7..6535a0ec9e81 100644
  
  Library("delay_based_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index a77055ccdac9..9475b31f9aaa 100644
+index 2ff7d7e61721..db8bb8347bf0 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -56883,7 +57073,7 @@ index a77055ccdac9..9475b31f9aaa 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,93 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56978,7 +57168,7 @@ index a77055ccdac9..9475b31f9aaa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57065,16 +57255,17 @@ index a77055ccdac9..9475b31f9aaa 100644
  
  Library("estimators_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index 0a9814333b31..212b0ad6dd21 100644
+index 05248cd8bd3b..13d7bdbe4118 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -57090,7 +57281,7 @@ index 0a9814333b31..212b0ad6dd21 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57186,7 +57377,7 @@ index 0a9814333b31..212b0ad6dd21 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57273,16 +57464,17 @@ index 0a9814333b31..212b0ad6dd21 100644
  
  Library("goog_cc_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index aac6b3bd8559..837ba3ec6c9f 100644
+index 352c645526be..5ef0797339f3 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -57298,7 +57490,7 @@ index aac6b3bd8559..837ba3ec6c9f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57386,7 +57578,7 @@ index aac6b3bd8559..837ba3ec6c9f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57473,16 +57665,17 @@ index aac6b3bd8559..837ba3ec6c9f 100644
  
  Library("link_capacity_estimator_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index 966c3862293a..f458c2372ba0 100644
+index c2b83818ef52..1675e39cdcdf 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -57498,7 +57691,7 @@ index 966c3862293a..f458c2372ba0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57593,7 +57786,7 @@ index 966c3862293a..f458c2372ba0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57680,16 +57873,17 @@ index 966c3862293a..f458c2372ba0 100644
  
  Library("loss_based_bwe_v2_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index ff8f2a440a1f..063cb6f8f88d 100644
+index c4e15050b1cc..c5bfa65be497 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -57705,7 +57899,7 @@ index ff8f2a440a1f..063cb6f8f88d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57800,7 +57994,7 @@ index ff8f2a440a1f..063cb6f8f88d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -57887,16 +58081,17 @@ index ff8f2a440a1f..063cb6f8f88d 100644
  
  Library("probe_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index 50844ee8832c..37b71e85844f 100644
+index 08d86b5be297..fec6c2f95993 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -57912,7 +58107,7 @@ index 50844ee8832c..37b71e85844f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58007,7 +58202,7 @@ index 50844ee8832c..37b71e85844f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58094,16 +58289,17 @@ index 50844ee8832c..37b71e85844f 100644
  
  Library("pushback_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-index fc3f36198875..162fbab4195f 100644
+index 5ab5bde3e74b..792fd219d079 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -58119,7 +58315,7 @@ index fc3f36198875..162fbab4195f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58214,7 +58410,7 @@ index fc3f36198875..162fbab4195f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58301,16 +58497,17 @@ index fc3f36198875..162fbab4195f 100644
  
  Library("send_side_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc_scream_network_controller/goog_cc_scream_network_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc_scream_network_controller/goog_cc_scream_network_controller_gn/moz.build
-index 6080061fa7a3..cd21d78e58fe 100644
+index 2cd6758ae721..a5b54c3b8df2 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc_scream_network_controller/goog_cc_scream_network_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc_scream_network_controller/goog_cc_scream_network_controller_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -58326,7 +58523,7 @@ index 6080061fa7a3..cd21d78e58fe 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58422,7 +58619,7 @@ index 6080061fa7a3..cd21d78e58fe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58509,16 +58706,17 @@ index 6080061fa7a3..cd21d78e58fe 100644
  
  Library("goog_cc_scream_network_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/congestion_controller_feedback_stats_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/congestion_controller_feedback_stats_gn/moz.build
-index 4ff69b962bfa..b1b846f0cda6 100644
+index 3857af3c7eba..a396a8b274e5 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/congestion_controller_feedback_stats_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/congestion_controller_feedback_stats_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -58534,7 +58732,7 @@ index 4ff69b962bfa..b1b846f0cda6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58618,7 +58816,7 @@ index 4ff69b962bfa..b1b846f0cda6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58644,7 +58842,7 @@ index 4ff69b962bfa..b1b846f0cda6 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -58686,16 +58884,17 @@ index 4ff69b962bfa..b1b846f0cda6 100644
 -
  Library("congestion_controller_feedback_stats_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index 2360a15491dc..5f1a2ac7442a 100644
+index 61c31e73cea7..79fdd5090fcd 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -58711,7 +58910,7 @@ index 2360a15491dc..5f1a2ac7442a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58807,7 +59006,7 @@ index 2360a15491dc..5f1a2ac7442a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -58894,16 +59093,17 @@ index 2360a15491dc..5f1a2ac7442a 100644
  
  Library("control_handler_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index d29224be7452..f3bcafd8ad85 100644
+index 6de5ef87bd40..3c9395d318df 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -58919,7 +59119,7 @@ index d29224be7452..f3bcafd8ad85 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59014,7 +59214,7 @@ index d29224be7452..f3bcafd8ad85 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59101,16 +59301,17 @@ index d29224be7452..f3bcafd8ad85 100644
  
  Library("transport_feedback_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/scream/delay_based_congestion_control_gn/moz.build third_party/libwebrtc/modules/congestion_controller/scream/delay_based_congestion_control_gn/moz.build
-index 9b7faeb94044..d1a973777d7c 100644
+index f2c810f376fa..299134f28d78 100644
 --- third_party/libwebrtc/modules/congestion_controller/scream/delay_based_congestion_control_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/scream/delay_based_congestion_control_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -59126,7 +59327,7 @@ index 9b7faeb94044..d1a973777d7c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59221,7 +59422,7 @@ index 9b7faeb94044..d1a973777d7c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59308,16 +59509,17 @@ index 9b7faeb94044..d1a973777d7c 100644
  
  Library("delay_based_congestion_control_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/scream/scream_network_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/scream/scream_network_controller_gn/moz.build
-index 5b94e991d333..b2ab86384abb 100644
+index 43938ca70a1e..315862fc1150 100644
 --- third_party/libwebrtc/modules/congestion_controller/scream/scream_network_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/scream/scream_network_controller_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -59333,7 +59535,7 @@ index 5b94e991d333..b2ab86384abb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59428,7 +59630,7 @@ index 5b94e991d333..b2ab86384abb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59515,16 +59717,17 @@ index 5b94e991d333..b2ab86384abb 100644
  
  Library("scream_network_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_gn/moz.build
-index a12b750b0c29..8a7dd6a8cc8b 100644
+index 739c55d37bdb..c9a101d3efde 100644
 --- third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -59540,7 +59743,7 @@ index a12b750b0c29..8a7dd6a8cc8b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59635,7 +59838,7 @@ index a12b750b0c29..8a7dd6a8cc8b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59722,16 +59925,17 @@ index a12b750b0c29..8a7dd6a8cc8b 100644
  
  Library("scream_v2_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_parameters_gn/moz.build third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_parameters_gn/moz.build
-index b1aaa17d7bc7..ca224785e0a8 100644
+index 7ef5c259d79d..426263159ccd 100644
 --- third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_parameters_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/scream/scream_v2_parameters_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -59747,7 +59951,7 @@ index b1aaa17d7bc7..ca224785e0a8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59842,7 +60046,7 @@ index b1aaa17d7bc7..ca224785e0a8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -59929,19 +60133,20 @@ index b1aaa17d7bc7..ca224785e0a8 100644
  
  Library("scream_v2_parameters_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-index e7579297f794..3a83dde9190a 100644
+index 50d5d5d9a5cc..48ba3ce75cef 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_AVX2"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -59955,7 +60160,7 @@ index e7579297f794..3a83dde9190a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,102 +56,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,102 +57,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60061,16 +60266,17 @@ index e7579297f794..3a83dde9190a 100644
      CXXFLAGS += [
          "-msse2"
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-index 9e856db8df87..78652d03cb96 100644
+index 934dde44403f..3a1f2961cab0 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-@@ -26,12 +26,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -26,13 +26,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -60086,7 +60292,7 @@ index 9e856db8df87..78652d03cb96 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -84,180 +93,14 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -85,180 +94,14 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60269,7 +60475,7 @@ index 9e856db8df87..78652d03cb96 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -265,7 +108,8 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -266,7 +109,8 @@ if CONFIG["TARGET_CPU"] == "arm":
      ]
  
      SOURCES += [
@@ -60279,7 +60485,7 @@ index 9e856db8df87..78652d03cb96 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -275,34 +119,9 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -276,34 +120,9 @@ if CONFIG["TARGET_CPU"] == "arm":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -60317,7 +60523,7 @@ index 9e856db8df87..78652d03cb96 100644
      ]
  
  if CONFIG["TARGET_CPU"] == "mips32":
-@@ -310,7 +129,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -311,7 +130,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
      DEFINES["MIPS32_LE"] = True
      DEFINES["MIPS_FPU_LE"] = True
      DEFINES["WEBRTC_USE_PIPEWIRE"] = True
@@ -60325,7 +60531,7 @@ index 9e856db8df87..78652d03cb96 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -318,7 +136,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -319,7 +137,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
      ]
  
      SOURCES += [
@@ -60335,7 +60541,7 @@ index 9e856db8df87..78652d03cb96 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -328,13 +147,14 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -329,13 +148,14 @@ if CONFIG["TARGET_CPU"] == "mips32":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -60352,7 +60558,7 @@ index 9e856db8df87..78652d03cb96 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -342,7 +162,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -343,7 +163,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
      ]
  
      SOURCES += [
@@ -60362,7 +60568,7 @@ index 9e856db8df87..78652d03cb96 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -352,117 +173,19 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -353,117 +174,19 @@ if CONFIG["TARGET_CPU"] == "mips64":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -60484,7 +60690,7 @@ index 9e856db8df87..78652d03cb96 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -470,7 +193,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -471,7 +194,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
      ]
  
      SOURCES += [
@@ -60494,7 +60700,7 @@ index 9e856db8df87..78652d03cb96 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -480,13 +204,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -481,13 +205,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -60513,7 +60719,7 @@ index 9e856db8df87..78652d03cb96 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -494,7 +220,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -495,7 +221,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
      ]
  
      SOURCES += [
@@ -60523,7 +60729,7 @@ index 9e856db8df87..78652d03cb96 100644
      ]
  
      UNIFIED_SOURCES += [
-@@ -504,10 +231,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -505,10 +232,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
          "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -60538,7 +60744,7 @@ index 9e856db8df87..78652d03cb96 100644
  
      DEFINES["WEBRTC_USE_X11"] = True
  
-@@ -533,134 +262,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
+@@ -534,134 +263,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
          "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
      ]
  
@@ -60705,10 +60911,10 @@ index 9e856db8df87..78652d03cb96 100644
  Library("desktop_capture_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
 deleted file mode 100644
-index e27c2d700063..000000000000
+index f97d8e850e94..000000000000
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
 +++ /dev/null
-@@ -1,81 +0,0 @@
+@@ -1,82 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -60728,6 +60934,7 @@ index e27c2d700063..000000000000
 -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -60791,16 +60998,17 @@ index e27c2d700063..000000000000
 -
 -Library("desktop_capture_objc_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-index 9d966c83f568..fe4c0e8d1fb2 100644
+index 05ce4fc73eb3..a4dc4825c863 100644
 --- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -60816,7 +61024,7 @@ index 9d966c83f568..fe4c0e8d1fb2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,75 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,75 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60893,7 +61101,7 @@ index 9d966c83f568..fe4c0e8d1fb2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -128,69 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -129,69 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -60967,16 +61175,17 @@ index 9d966c83f568..fe4c0e8d1fb2 100644
  
  Library("primitives_gn")
 diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index 88c4f9659e24..57cdaa5b4aa7 100644
+index df04110f6429..f0fcf7c1a4ab 100644
 --- third_party/libwebrtc/modules/module_api_gn/moz.build
 +++ third_party/libwebrtc/modules/module_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -60992,7 +61201,7 @@ index 88c4f9659e24..57cdaa5b4aa7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61076,7 +61285,7 @@ index 88c4f9659e24..57cdaa5b4aa7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61102,7 +61311,7 @@ index 88c4f9659e24..57cdaa5b4aa7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -61144,16 +61353,17 @@ index 88c4f9659e24..57cdaa5b4aa7 100644
 -
  Library("module_api_gn")
 diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index 60a59ac68ba0..5cadc26111a4 100644
+index 5f9e43e8f19f..598fdf87889f 100644
 --- third_party/libwebrtc/modules/module_api_public_gn/moz.build
 +++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -61169,7 +61379,7 @@ index 60a59ac68ba0..5cadc26111a4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61253,7 +61463,7 @@ index 60a59ac68ba0..5cadc26111a4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61279,7 +61489,7 @@ index 60a59ac68ba0..5cadc26111a4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -61321,16 +61531,17 @@ index 60a59ac68ba0..5cadc26111a4 100644
 -
  Library("module_api_public_gn")
 diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index af36f290a1db..bbb06a63bfc0 100644
+index 622f0ab46b40..22e0ec32a200 100644
 --- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
 +++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -61346,7 +61557,7 @@ index af36f290a1db..bbb06a63bfc0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61430,7 +61641,7 @@ index af36f290a1db..bbb06a63bfc0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61456,7 +61667,7 @@ index af36f290a1db..bbb06a63bfc0 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -61498,16 +61709,17 @@ index af36f290a1db..bbb06a63bfc0 100644
 -
  Library("module_fec_api_gn")
 diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index 1a5e2ac45c89..b9cc24f035e6 100644
+index 5bd8eb5ece9c..a1d12b54b2ca 100644
 --- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -61523,7 +61735,7 @@ index 1a5e2ac45c89..b9cc24f035e6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61611,7 +61823,7 @@ index 1a5e2ac45c89..b9cc24f035e6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61698,16 +61910,17 @@ index 1a5e2ac45c89..b9cc24f035e6 100644
  
  Library("interval_budget_gn")
 diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index f9e685490ccc..9c976398855b 100644
+index f23fc647c82d..a7bd1b16a1e7 100644
 --- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -61723,7 +61936,7 @@ index f9e685490ccc..9c976398855b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,94 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61819,7 +62032,7 @@ index f9e685490ccc..9c976398855b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -148,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61906,10 +62119,10 @@ index f9e685490ccc..9c976398855b 100644
  
  Library("pacing_gn")
 diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build
-index a50648a9760d..c23281dee375 100644
+index b666153b7c22..86e3a0238175 100644
 --- third_party/libwebrtc/modules/portal/portal_gn/moz.build
 +++ third_party/libwebrtc/modules/portal/portal_gn/moz.build
-@@ -26,21 +26,18 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -26,22 +26,19 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -61918,6 +62131,7 @@ index a50648a9760d..c23281dee375 100644
  DEFINES["USE_OZONE"] = "1"
 -DEFINES["USE_UDEV"] = True
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -61932,7 +62146,7 @@ index a50648a9760d..c23281dee375 100644
  DEFINES["_LARGEFILE64_SOURCE"] = True
  DEFINES["_LARGEFILE_SOURCE"] = True
  DEFINES["__STDC_CONSTANT_MACROS"] = True
-@@ -84,16 +81,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -85,16 +82,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -61950,16 +62164,17 @@ index a50648a9760d..c23281dee375 100644
  
      DEFINES["MIPS32_LE"] = True
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-index 5f89c5fb33ad..23e0dcd377fa 100644
+index 92f32b06d35f..9e89eeaa612d 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -61975,7 +62190,7 @@ index 5f89c5fb33ad..23e0dcd377fa 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62070,7 +62285,7 @@ index 5f89c5fb33ad..23e0dcd377fa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62157,16 +62372,17 @@ index 5f89c5fb33ad..23e0dcd377fa 100644
  
  Library("congestion_control_feedback_generator_gn")
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-index 44a231954c82..bf00b83cbc62 100644
+index bafb33b2b35f..3eae2d64fcd3 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -62182,7 +62398,7 @@ index 44a231954c82..bf00b83cbc62 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -55,93 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62277,7 +62493,7 @@ index 44a231954c82..bf00b83cbc62 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -149,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62364,16 +62580,17 @@ index 44a231954c82..bf00b83cbc62 100644
  
  Library("remote_bitrate_estimator_gn")
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
-index 72f3f6d79b1f..319c8f69ecf6 100644
+index b68d96756953..17ecefb4aeeb 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -62389,7 +62606,7 @@ index 72f3f6d79b1f..319c8f69ecf6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62484,7 +62701,7 @@ index 72f3f6d79b1f..319c8f69ecf6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62510,7 +62727,7 @@ index 72f3f6d79b1f..319c8f69ecf6 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -62552,16 +62769,17 @@ index 72f3f6d79b1f..319c8f69ecf6 100644
 -
  Library("rtp_transport_feedback_generator_gn")
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-index e445120c239a..add7af188efb 100644
+index ff7a88ebf4e5..02879bea4c4f 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -62577,7 +62795,7 @@ index e445120c239a..add7af188efb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62672,7 +62890,7 @@ index e445120c239a..add7af188efb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62759,16 +62977,17 @@ index e445120c239a..add7af188efb 100644
  
  Library("transport_sequence_number_feedback_generator_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-index 863003cc6dba..f373e77842eb 100644
+index 0dfb21e8c035..e9011df2e155 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -62784,7 +63003,7 @@ index 863003cc6dba..f373e77842eb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62868,7 +63087,7 @@ index 863003cc6dba..f373e77842eb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -62955,16 +63174,17 @@ index 863003cc6dba..f373e77842eb 100644
  
  Library("leb128_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-index fb98c4bc6b0a..059bd85c05f4 100644
+index a4cfeacfd703..e633d38d2048 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -62980,7 +63200,7 @@ index fb98c4bc6b0a..059bd85c05f4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63075,7 +63295,7 @@ index fb98c4bc6b0a..059bd85c05f4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -63162,16 +63382,17 @@ index fb98c4bc6b0a..059bd85c05f4 100644
  
  Library("ntp_time_util_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-index fdec383ccab9..3abb078532e3 100644
+index 021b7f583c22..1db06cb76b20 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -63187,7 +63408,7 @@ index fdec383ccab9..3abb078532e3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -90,93 +99,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -91,93 +100,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63282,7 +63503,7 @@ index fdec383ccab9..3abb078532e3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -184,82 +107,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -185,82 +108,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -63369,16 +63590,17 @@ index fdec383ccab9..3abb078532e3 100644
  
  Library("rtp_rtcp_format_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index 3a7e03c6c39a..f22cc7aee488 100644
+index d16dc9a1c641..bc8c41992640 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -63577,16 +63799,17 @@ index 3a7e03c6c39a..f22cc7aee488 100644
  
  Library("rtp_rtcp_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index e9dd4a5fb67c..95494a301fdf 100644
+index 0df8f2fd7ef2..a24f15100cd4 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -63602,7 +63825,7 @@ index e9dd4a5fb67c..95494a301fdf 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63697,7 +63920,7 @@ index e9dd4a5fb67c..95494a301fdf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -63784,16 +64007,17 @@ index e9dd4a5fb67c..95494a301fdf 100644
  
  Library("rtp_video_header_gn")
 diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index 4e3b42f6558b..ad4e476910dc 100644
+index 82962641e33c..8cbad5b948db 100644
 --- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -63809,7 +64033,7 @@ index 4e3b42f6558b..ad4e476910dc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63893,7 +64117,7 @@ index 4e3b42f6558b..ad4e476910dc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -63980,16 +64204,17 @@ index 4e3b42f6558b..ad4e476910dc 100644
  
  Library("fft_gn")
 diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index 92205c179088..f2769d4fd4d2 100644
+index 7887dfe7ada3..029dd57a8a56 100644
 --- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -64005,7 +64230,7 @@ index 92205c179088..f2769d4fd4d2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64089,7 +64314,7 @@ index 92205c179088..f2769d4fd4d2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64176,16 +64401,17 @@ index 92205c179088..f2769d4fd4d2 100644
  
  Library("g711_3p_gn")
 diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index 18a478d539ee..af5dea7e19d3 100644
+index 8967c3d1863f..98edd462fdda 100644
 --- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -64201,7 +64427,7 @@ index 18a478d539ee..af5dea7e19d3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,82 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,82 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64285,7 +64511,7 @@ index 18a478d539ee..af5dea7e19d3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64372,16 +64598,17 @@ index 18a478d539ee..af5dea7e19d3 100644
  
  Library("g722_3p_gn")
 diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index 39011ae5e091..422703862311 100644
+index 6eaf4ee45534..940af762b191 100644
 --- third_party/libwebrtc/modules/utility/utility_gn/moz.build
 +++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -64397,7 +64624,7 @@ index 39011ae5e091..422703862311 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,90 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,90 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64489,7 +64716,7 @@ index 39011ae5e091..422703862311 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -64515,7 +64742,7 @@ index 39011ae5e091..422703862311 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -161,52 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,52 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -64569,16 +64796,17 @@ index 39011ae5e091..422703862311 100644
 -
  Library("utility_gn")
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index ed3ef3b74c07..d03874fab0d2 100644
+index aba5cf5837e9..7dc15df9125e 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-@@ -18,12 +18,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -64594,7 +64822,7 @@ index ed3ef3b74c07..d03874fab0d2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -39,6 +48,10 @@ LOCAL_INCLUDES += [
+@@ -40,6 +49,10 @@ LOCAL_INCLUDES += [
  ]
  
  UNIFIED_SOURCES += [
@@ -64605,7 +64833,7 @@ index ed3ef3b74c07..d03874fab0d2 100644
      "/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
  ]
  
-@@ -51,166 +64,14 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,166 +65,14 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64774,7 +65002,7 @@ index ed3ef3b74c07..d03874fab0d2 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -224,44 +85,11 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -225,44 +86,11 @@ if CONFIG["TARGET_CPU"] == "mips64":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -64822,7 +65050,7 @@ index ed3ef3b74c07..d03874fab0d2 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -275,10 +103,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -276,10 +104,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -64834,7 +65062,7 @@ index ed3ef3b74c07..d03874fab0d2 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -292,14 +119,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+@@ -293,14 +120,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -64851,7 +65079,7 @@ index ed3ef3b74c07..d03874fab0d2 100644
  
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
-@@ -313,10 +140,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -314,10 +141,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -64865,16 +65093,17 @@ index ed3ef3b74c07..d03874fab0d2 100644
      LOCAL_INCLUDES += [
          "/third_party/libepoxy/libepoxy/include/",
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-index 7d2cb6e37fb9..d773975e789d 100644
+index d7e0525a50c2..b387735625e3 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -64890,7 +65119,7 @@ index 7d2cb6e37fb9..d773975e789d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,93 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64985,7 +65214,7 @@ index 7d2cb6e37fb9..d773975e789d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65072,16 +65301,17 @@ index 7d2cb6e37fb9..d773975e789d 100644
  
  Library("video_capture_module_gn")
 diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index 1e7b10688f3e..0c9e69f6d9ce 100644
+index 3a37045d6b49..24cfc98220fb 100644
 --- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -65097,7 +65327,7 @@ index 1e7b10688f3e..0c9e69f6d9ce 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65192,7 +65422,7 @@ index 1e7b10688f3e..0c9e69f6d9ce 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65279,16 +65509,17 @@ index 1e7b10688f3e..0c9e69f6d9ce 100644
  
  Library("chain_diff_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index 05cfb2a8de36..730f9581e95a 100644
+index 4bfff4c5ed83..08e5865b1380 100644
 --- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -65304,7 +65535,7 @@ index 05cfb2a8de36..730f9581e95a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65392,7 +65623,7 @@ index 05cfb2a8de36..730f9581e95a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65418,7 +65649,7 @@ index 05cfb2a8de36..730f9581e95a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -65460,16 +65691,17 @@ index 05cfb2a8de36..730f9581e95a 100644
 -
  Library("codec_globals_headers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-index 1f07c3406aa5..ce5dd4056087 100644
+index f1f55758a79d..3e4d603136ca 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -65485,7 +65717,7 @@ index 1f07c3406aa5..ce5dd4056087 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65580,7 +65812,7 @@ index 1f07c3406aa5..ce5dd4056087 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65667,16 +65899,17 @@ index 1f07c3406aa5..ce5dd4056087 100644
  
  Library("av1_svc_config_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-index c1c8b0a7c64e..858945cd9a2e 100644
+index 292e4fa61a2b..9943164f8163 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,13 +16,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -65692,7 +65925,7 @@ index c1c8b0a7c64e..858945cd9a2e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,93 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65787,7 +66020,7 @@ index c1c8b0a7c64e..858945cd9a2e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -65874,16 +66107,17 @@ index c1c8b0a7c64e..858945cd9a2e 100644
  
  Library("dav1d_decoder_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-index 1b1bb0aebb9f..de9c51fe107e 100644
+index fd4ee56fb4eb..5a875e82328b 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,13 +16,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -65899,7 +66133,7 @@ index 1b1bb0aebb9f..de9c51fe107e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,94 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,94 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65995,7 +66229,7 @@ index 1b1bb0aebb9f..de9c51fe107e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -144,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -145,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66082,16 +66316,17 @@ index 1b1bb0aebb9f..de9c51fe107e 100644
  
  Library("aom_av1_encoder_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_speed_config_factory_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_speed_config_factory_gn/moz.build
-index bd47c3e20e3c..b03d6452b545 100644
+index 7fc041861dbc..97957d73073a 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_speed_config_factory_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_speed_config_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -66107,7 +66342,7 @@ index bd47c3e20e3c..b03d6452b545 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66203,7 +66438,7 @@ index bd47c3e20e3c..b03d6452b545 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66290,16 +66525,17 @@ index bd47c3e20e3c..b03d6452b545 100644
  
  Library("aom_speed_config_factory_gn")
 diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-index 3d9b5c87e574..d9dd5185ae93 100644
+index 00ce81ca7345..c80a26cf2c62 100644
 --- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -66315,7 +66551,7 @@ index 3d9b5c87e574..d9dd5185ae93 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66410,7 +66646,7 @@ index 3d9b5c87e574..d9dd5185ae93 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66497,16 +66733,17 @@ index 3d9b5c87e574..d9dd5185ae93 100644
  
  Library("encoded_frame_gn")
 diff --git third_party/libwebrtc/modules/video_coding/encoder_speed_controller_impl_gn/moz.build third_party/libwebrtc/modules/video_coding/encoder_speed_controller_impl_gn/moz.build
-index 377863d0912b..de9d5b5e37e7 100644
+index 33efc85c10c3..8e66c4704c79 100644
 --- third_party/libwebrtc/modules/video_coding/encoder_speed_controller_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/encoder_speed_controller_impl_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -66522,7 +66759,7 @@ index 377863d0912b..de9d5b5e37e7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66617,7 +66854,7 @@ index 377863d0912b..de9d5b5e37e7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66704,16 +66941,17 @@ index 377863d0912b..de9d5b5e37e7 100644
  
  Library("encoder_speed_controller_impl_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index c6f81b4ed4d4..b4bfea458e5c 100644
+index 1087eb83141a..4cb2a33cec55 100644
 --- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -66729,7 +66967,7 @@ index c6f81b4ed4d4..b4bfea458e5c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66824,7 +67062,7 @@ index c6f81b4ed4d4..b4bfea458e5c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -66911,16 +67149,17 @@ index c6f81b4ed4d4..b4bfea458e5c 100644
  
  Library("frame_dependencies_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index 251b15e896bf..3d298942614e 100644
+index 444b7d652b93..cea4b7cf3cc8 100644
 --- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -66936,7 +67175,7 @@ index 251b15e896bf..3d298942614e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67031,7 +67270,7 @@ index 251b15e896bf..3d298942614e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67118,16 +67357,17 @@ index 251b15e896bf..3d298942614e 100644
  
  Library("frame_helpers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
-index 0b9bedb1d288..aeb9164b7b97 100644
+index 53be3eaec7d5..f8d7e482291e 100644
 --- third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_sampler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -67143,7 +67383,7 @@ index 0b9bedb1d288..aeb9164b7b97 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67238,7 +67478,7 @@ index 0b9bedb1d288..aeb9164b7b97 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67325,16 +67565,17 @@ index 0b9bedb1d288..aeb9164b7b97 100644
  
  Library("frame_sampler_gn")
 diff --git third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-index d71cb5796e1d..a13914a39e24 100644
+index f6d57ebe3b7e..bdf531205551 100644
 --- third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -67350,7 +67591,7 @@ index d71cb5796e1d..a13914a39e24 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67445,7 +67686,7 @@ index d71cb5796e1d..a13914a39e24 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67532,16 +67773,17 @@ index d71cb5796e1d..a13914a39e24 100644
  
  Library("h264_sprop_parameter_sets_gn")
 diff --git third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-index e672f30de7f8..a6581971c3ff 100644
+index 4cf88157ca98..33ce0c1a68de 100644
 --- third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -67557,7 +67799,7 @@ index e672f30de7f8..a6581971c3ff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67652,7 +67894,7 @@ index e672f30de7f8..a6581971c3ff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67739,16 +67981,17 @@ index e672f30de7f8..a6581971c3ff 100644
  
  Library("h26x_packet_buffer_gn")
 diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-index 4d6c27a8cc9f..0f47848b2873 100644
+index a161327c3892..26aa2ed249c7 100644
 --- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -67764,7 +68007,7 @@ index 4d6c27a8cc9f..0f47848b2873 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67859,7 +68102,7 @@ index 4d6c27a8cc9f..0f47848b2873 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -67946,16 +68189,17 @@ index 4d6c27a8cc9f..0f47848b2873 100644
  
  Library("nack_requester_gn")
 diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index 7583fd14da48..250ae7177cda 100644
+index 307690f64b13..5ab900dd4325 100644
 --- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -67971,7 +68215,7 @@ index 7583fd14da48..250ae7177cda 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68066,7 +68310,7 @@ index 7583fd14da48..250ae7177cda 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68153,16 +68397,17 @@ index 7583fd14da48..250ae7177cda 100644
  
  Library("packet_buffer_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-index 16a769513750..d073b9ad375e 100644
+index e981d193c0a4..572e7f38b2fb 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -68178,7 +68423,7 @@ index 16a769513750..d073b9ad375e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68273,7 +68518,7 @@ index 16a769513750..d073b9ad375e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68360,16 +68605,17 @@ index 16a769513750..d073b9ad375e 100644
  
  Library("scalability_mode_util_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-index 5540aa87f9c9..3ab93bb4ad62 100644
+index 3b3d13d37741..3bb8d27113a3 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -68385,7 +68631,7 @@ index 5540aa87f9c9..3ab93bb4ad62 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -53,93 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,93 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68480,7 +68726,7 @@ index 5540aa87f9c9..3ab93bb4ad62 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -147,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68567,16 +68813,17 @@ index 5540aa87f9c9..3ab93bb4ad62 100644
  
  Library("scalability_structures_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-index adbdcd25b8ac..eef0f099b359 100644
+index 3d898b9715d1..5a1ed09bd57f 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -68592,7 +68839,7 @@ index adbdcd25b8ac..eef0f099b359 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68680,7 +68927,7 @@ index adbdcd25b8ac..eef0f099b359 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68767,16 +69014,17 @@ index adbdcd25b8ac..eef0f099b359 100644
  
  Library("scalable_video_controller_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-index f58ee6d17f4f..a2bb00a16786 100644
+index 09209033ac79..9c6e779db540 100644
 --- third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -68792,7 +69040,7 @@ index f58ee6d17f4f..a2bb00a16786 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68888,7 +69136,7 @@ index f58ee6d17f4f..a2bb00a16786 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -68975,16 +69223,17 @@ index f58ee6d17f4f..a2bb00a16786 100644
  
  Library("simulcast_to_svc_converter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-index 3429ebfbe312..544297c36cfe 100644
+index 6951f007d52a..afd99b119ad1 100644
 --- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -69000,7 +69249,7 @@ index 3429ebfbe312..544297c36cfe 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69095,7 +69344,7 @@ index 3429ebfbe312..544297c36cfe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69182,16 +69431,17 @@ index 3429ebfbe312..544297c36cfe 100644
  
  Library("svc_rate_allocator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-index 27c38ed7b639..bf60f4bd2dc5 100644
+index f7bc710bb6a6..8cd9ebc51715 100644
 --- third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -69207,7 +69457,7 @@ index 27c38ed7b639..bf60f4bd2dc5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69295,7 +69545,7 @@ index 27c38ed7b639..bf60f4bd2dc5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69382,16 +69632,17 @@ index 27c38ed7b639..bf60f4bd2dc5 100644
  
  Library("decode_time_percentile_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-index c84fe43bf7ce..06e4fdb58172 100644
+index 5cf46c24c947..558cfa36441d 100644
 --- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -69407,7 +69658,7 @@ index c84fe43bf7ce..06e4fdb58172 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69495,7 +69746,7 @@ index c84fe43bf7ce..06e4fdb58172 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69582,16 +69833,17 @@ index c84fe43bf7ce..06e4fdb58172 100644
  
  Library("frame_delay_variation_kalman_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-index d33868bac4b2..2cae7d1663d2 100644
+index fc0611ad5b1a..879b269eac7c 100644
 --- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -69607,7 +69859,7 @@ index d33868bac4b2..2cae7d1663d2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69695,7 +69947,7 @@ index d33868bac4b2..2cae7d1663d2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69782,16 +70034,17 @@ index d33868bac4b2..2cae7d1663d2 100644
  
  Library("inter_frame_delay_variation_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-index 9f08b514eb3f..63970d48a4ff 100644
+index c603c804678b..70d5a3a581fa 100644
 --- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -69807,7 +70060,7 @@ index 9f08b514eb3f..63970d48a4ff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69902,7 +70155,7 @@ index 9f08b514eb3f..63970d48a4ff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -69989,16 +70242,17 @@ index 9f08b514eb3f..63970d48a4ff 100644
  
  Library("jitter_estimator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-index 092bdff85b3c..3ec4af4c6cbe 100644
+index cdf179861592..1c570c21b839 100644
 --- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -70014,7 +70268,7 @@ index 092bdff85b3c..3ec4af4c6cbe 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70102,7 +70356,7 @@ index 092bdff85b3c..3ec4af4c6cbe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70189,16 +70443,17 @@ index 092bdff85b3c..3ec4af4c6cbe 100644
  
  Library("rtt_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-index 9de0f87aa8ec..8d9fcf670160 100644
+index 591d3264fb41..3a7b00344998 100644
 --- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -70214,7 +70469,7 @@ index 9de0f87aa8ec..8d9fcf670160 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70309,7 +70564,7 @@ index 9de0f87aa8ec..8d9fcf670160 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70396,16 +70651,17 @@ index 9de0f87aa8ec..8d9fcf670160 100644
  
  Library("timestamp_extrapolator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-index 496eb2282038..226b3928e1e8 100644
+index 0d28921f3881..61ab6154db81 100644
 --- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -70421,7 +70677,7 @@ index 496eb2282038..226b3928e1e8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70516,7 +70772,7 @@ index 496eb2282038..226b3928e1e8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70603,16 +70859,17 @@ index 496eb2282038..226b3928e1e8 100644
  
  Library("timing_module_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index a39517365ba9..49f00b43c0d7 100644
+index ea640b91b0c0..50c77c5b4680 100644
 --- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -70628,7 +70885,7 @@ index a39517365ba9..49f00b43c0d7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70723,7 +70980,7 @@ index a39517365ba9..49f00b43c0d7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -70810,16 +71067,17 @@ index a39517365ba9..49f00b43c0d7 100644
  
  Library("video_codec_interface_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-index 44792bb4ce07..2fc63265c596 100644
+index b4524c603de6..706318dd7bed 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -70835,7 +71093,7 @@ index 44792bb4ce07..2fc63265c596 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,94 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -60,94 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70931,7 +71189,7 @@ index 44792bb4ce07..2fc63265c596 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -154,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -155,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71018,16 +71276,17 @@ index 44792bb4ce07..2fc63265c596 100644
  
  Library("video_coding_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index 2d13ee08ef4d..f0b4a9d41861 100644
+index b61b9b1f0762..2d66a7998f0e 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -71043,7 +71302,7 @@ index 2d13ee08ef4d..f0b4a9d41861 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,94 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,94 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71139,7 +71398,7 @@ index 2d13ee08ef4d..f0b4a9d41861 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -152,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -153,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71226,16 +71485,17 @@ index 2d13ee08ef4d..f0b4a9d41861 100644
  
  Library("video_coding_utility_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-index 17a993bfc02c..aa23c6c09134 100644
+index 6563afa1519b..b68245f1e382 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -71251,7 +71511,7 @@ index 17a993bfc02c..aa23c6c09134 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,94 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71347,7 +71607,7 @@ index 17a993bfc02c..aa23c6c09134 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71434,16 +71694,17 @@ index 17a993bfc02c..aa23c6c09134 100644
  
  Library("webrtc_h264_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index 1646d8078da0..a96575721cb6 100644
+index 06dddf6d386b..f3ed81e3cc02 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,13 +16,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -71459,7 +71720,7 @@ index 1646d8078da0..a96575721cb6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,86 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71547,7 +71808,7 @@ index 1646d8078da0..a96575721cb6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71634,16 +71895,17 @@ index 1646d8078da0..a96575721cb6 100644
  
  Library("webrtc_libvpx_interface_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index 0fc3d55cad43..9ed831f4be8b 100644
+index 1fd1f5bc562f..73c54cc1ff44 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,13 +16,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -71659,7 +71921,7 @@ index 0fc3d55cad43..9ed831f4be8b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -52,94 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,94 +62,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71755,7 +72017,7 @@ index 0fc3d55cad43..9ed831f4be8b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -147,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -148,82 +70,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -71842,16 +72104,17 @@ index 0fc3d55cad43..9ed831f4be8b 100644
  
  Library("webrtc_vp8_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-index 264dd08bc9a5..b0719d66ae1f 100644
+index ac81d5ab092b..82c509986ccc 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -71867,7 +72130,7 @@ index 264dd08bc9a5..b0719d66ae1f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71955,7 +72218,7 @@ index 264dd08bc9a5..b0719d66ae1f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72042,16 +72305,17 @@ index 264dd08bc9a5..b0719d66ae1f 100644
  
  Library("webrtc_vp8_scalability_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index c3f86866b4e4..940bd6044109 100644
+index 31f671ae534c..08a795a335fe 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -72067,7 +72331,7 @@ index c3f86866b4e4..940bd6044109 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -51,94 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,94 +61,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72163,7 +72427,7 @@ index c3f86866b4e4..940bd6044109 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -146,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -147,82 +69,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72250,16 +72514,17 @@ index c3f86866b4e4..940bd6044109 100644
  
  Library("webrtc_vp8_temporal_layers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index 92d397f83465..c72091405763 100644
+index da2f14204530..82e605235d8f 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -16,12 +16,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,13 +16,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -72275,7 +72540,7 @@ index 92d397f83465..c72091405763 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,94 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72371,7 +72636,7 @@ index 92d397f83465..c72091405763 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72458,16 +72723,17 @@ index 92d397f83465..c72091405763 100644
  
  Library("webrtc_vp9_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index efec0c59e146..c41bffcdf583 100644
+index b8b6e1264abf..de7abe9355ce 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -72483,7 +72749,7 @@ index efec0c59e146..c41bffcdf583 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72578,7 +72844,7 @@ index efec0c59e146..c41bffcdf583 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -72665,7 +72931,7 @@ index efec0c59e146..c41bffcdf583 100644
  
  Library("webrtc_vp9_helpers_gn")
 diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index 42a8eca9b72c..c4c622373cd3 100644
+index f1a37d89c49d..fc011293e2b4 100644
 --- third_party/libwebrtc/moz.build
 +++ third_party/libwebrtc/moz.build
 @@ -305,6 +305,8 @@ DIRS += [
@@ -72677,7 +72943,7 @@ index 42a8eca9b72c..c4c622373cd3 100644
      "/third_party/libwebrtc/modules/module_api_gn",
      "/third_party/libwebrtc/modules/module_api_public_gn",
      "/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -537,138 +539,30 @@ DIRS += [
+@@ -536,138 +538,30 @@ DIRS += [
      "/third_party/libwebrtc/webrtc_gn"
  ]
  
@@ -72820,7 +73086,7 @@ index 42a8eca9b72c..c4c622373cd3 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -676,13 +570,11 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -675,13 +569,11 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
          "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
          "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -72835,7 +73101,7 @@ index 42a8eca9b72c..c4c622373cd3 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -690,73 +582,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -689,73 +581,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
          "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
          "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
          "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -72910,16 +73176,17 @@ index 42a8eca9b72c..c4c622373cd3 100644
 -        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
 -    ]
 diff --git third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
-index a2ef7098a26f..1e8a475473f4 100644
+index fc3ef8e7a6ec..8b46a83bb560 100644
 --- third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -72935,7 +73202,7 @@ index a2ef7098a26f..1e8a475473f4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72954,10 +73221,6 @@ index a2ef7098a26f..1e8a475473f4 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -73023,7 +73286,7 @@ index a2ef7098a26f..1e8a475473f4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73049,7 +73312,7 @@ index a2ef7098a26f..1e8a475473f4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -73091,16 +73354,17 @@ index a2ef7098a26f..1e8a475473f4 100644
 -
  Library("internal_types_gn")
 diff --git third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
-index 6be46fd27bf6..400de7c7e0e2 100644
+index ba32d722acfc..ad651b008b9f 100644
 --- third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -73116,7 +73380,7 @@ index 6be46fd27bf6..400de7c7e0e2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73200,7 +73464,7 @@ index 6be46fd27bf6..400de7c7e0e2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73226,7 +73490,7 @@ index 6be46fd27bf6..400de7c7e0e2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -73268,16 +73532,17 @@ index 6be46fd27bf6..400de7c7e0e2 100644
 -
  Library("math_gn")
 diff --git third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
-index 4a44c05a257b..c073abe0d419 100644
+index 3cab3bdec6eb..95d6fbcab347 100644
 --- third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -73293,7 +73558,7 @@ index 4a44c05a257b..c073abe0d419 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73381,7 +73646,7 @@ index 4a44c05a257b..c073abe0d419 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73407,7 +73672,7 @@ index 4a44c05a257b..c073abe0d419 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -73449,16 +73714,17 @@ index 4a44c05a257b..c073abe0d419 100644
 -
  Library("sequence_numbers_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
-index 35f9304a8ad6..9bc9113555e5 100644
+index 240d407a8dbb..702b6108bb69 100644
 --- third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -73474,7 +73740,7 @@ index 35f9304a8ad6..9bc9113555e5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73562,7 +73828,7 @@ index 35f9304a8ad6..9bc9113555e5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73588,7 +73854,7 @@ index 35f9304a8ad6..9bc9113555e5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -73630,16 +73896,17 @@ index 35f9304a8ad6..9bc9113555e5 100644
 -
  Library("bounded_io_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-index 24a6a24e0850..21dfb53299c9 100644
+index e4d9ba689645..c1cd5f765e88 100644
 --- third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -73655,7 +73922,7 @@ index 24a6a24e0850..21dfb53299c9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -63,93 +72,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -64,93 +73,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73750,7 +74017,7 @@ index 24a6a24e0850..21dfb53299c9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -157,82 +80,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -158,82 +81,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -73837,16 +74104,17 @@ index 24a6a24e0850..21dfb53299c9 100644
  
  Library("chunk_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-index 9f8072ccbb75..7af95f92aa07 100644
+index 6473005eeb3b..5d8fbba194e5 100644
 --- third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -73862,7 +74130,7 @@ index 9f8072ccbb75..7af95f92aa07 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73957,7 +74225,7 @@ index 9f8072ccbb75..7af95f92aa07 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74044,16 +74312,17 @@ index 9f8072ccbb75..7af95f92aa07 100644
  
  Library("chunk_validators_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-index 5d73b1db51a4..b41b8efa0ee2 100644
+index a902bd29755b..695a7f33a8bd 100644
 --- third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -74069,7 +74338,7 @@ index 5d73b1db51a4..b41b8efa0ee2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74088,10 +74357,6 @@ index 5d73b1db51a4..b41b8efa0ee2 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -74157,7 +74422,7 @@ index 5d73b1db51a4..b41b8efa0ee2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74215,10 +74480,10 @@ index 5d73b1db51a4..b41b8efa0ee2 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -74229,10 +74494,10 @@ index 5d73b1db51a4..b41b8efa0ee2 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -74244,16 +74509,17 @@ index 5d73b1db51a4..b41b8efa0ee2 100644
  
  Library("crc32c_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
-index 1c7b585c2926..6c8a16c55f90 100644
+index 131077f889a8..6d5a3309a971 100644
 --- third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -74269,7 +74535,7 @@ index 1c7b585c2926..6c8a16c55f90 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74357,7 +74623,7 @@ index 1c7b585c2926..6c8a16c55f90 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74383,7 +74649,7 @@ index 1c7b585c2926..6c8a16c55f90 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -74425,16 +74691,17 @@ index 1c7b585c2926..6c8a16c55f90 100644
 -
  Library("data_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-index b905fa35f1fe..0746b390cdbd 100644
+index 66ed62a6f390..42aa546e3d8a 100644
 --- third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -74450,7 +74717,7 @@ index b905fa35f1fe..0746b390cdbd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -59,93 +68,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -60,93 +69,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74545,7 +74812,7 @@ index b905fa35f1fe..0746b390cdbd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -153,82 +76,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -154,82 +77,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74632,16 +74899,17 @@ index b905fa35f1fe..0746b390cdbd 100644
  
  Library("error_cause_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-index 287f439c6c0f..a7fcad364e6e 100644
+index 11024f98f953..3daec848d93d 100644
 --- third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -74657,7 +74925,7 @@ index 287f439c6c0f..a7fcad364e6e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,93 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,93 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74752,7 +75020,7 @@ index 287f439c6c0f..a7fcad364e6e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -151,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -152,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -74839,16 +75107,17 @@ index 287f439c6c0f..a7fcad364e6e 100644
  
  Library("parameter_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-index 58f18e34123b..d40508c6cbb6 100644
+index 624bfff343f9..4c3212997b05 100644
 --- third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -74864,7 +75133,7 @@ index 58f18e34123b..d40508c6cbb6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74959,7 +75228,7 @@ index 58f18e34123b..d40508c6cbb6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75046,16 +75315,17 @@ index 58f18e34123b..d40508c6cbb6 100644
  
  Library("sctp_packet_gn")
 diff --git third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-index 102e2a7ffedc..01ec317b6b9e 100644
+index 3560c2f7561b..ef963870c630 100644
 --- third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -75071,7 +75341,7 @@ index 102e2a7ffedc..01ec317b6b9e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75166,7 +75436,7 @@ index 102e2a7ffedc..01ec317b6b9e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75253,16 +75523,17 @@ index 102e2a7ffedc..01ec317b6b9e 100644
  
  Library("tlv_trait_gn")
 diff --git third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-index ec8ad25e6576..88e84b3e84a8 100644
+index 17d577108778..0f796ba9791d 100644
 --- third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -75278,7 +75549,7 @@ index ec8ad25e6576..88e84b3e84a8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75373,7 +75644,7 @@ index ec8ad25e6576..88e84b3e84a8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75460,16 +75731,17 @@ index ec8ad25e6576..88e84b3e84a8 100644
  
  Library("factory_gn")
 diff --git third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-index f6bde482dd40..db4159f8c467 100644
+index 03948957cdfd..0f8ff54ea130 100644
 --- third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -75485,7 +75757,7 @@ index f6bde482dd40..db4159f8c467 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75573,7 +75845,7 @@ index f6bde482dd40..db4159f8c467 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75660,16 +75932,17 @@ index f6bde482dd40..db4159f8c467 100644
  
  Library("socket_gn")
 diff --git third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
-index ec5c0d8b1d8e..b63c73c26ce7 100644
+index d23d72de008f..3e8d8ec15fa0 100644
 --- third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -75685,7 +75958,7 @@ index ec5c0d8b1d8e..b63c73c26ce7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75773,7 +76046,7 @@ index ec5c0d8b1d8e..b63c73c26ce7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -75799,7 +76072,7 @@ index ec5c0d8b1d8e..b63c73c26ce7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -75841,16 +76114,17 @@ index ec5c0d8b1d8e..b63c73c26ce7 100644
 -
  Library("types_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-index 2f36a17ef96e..42cdf1668378 100644
+index b7864ae9e151..73a56a6adb52 100644
 --- third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -75866,7 +76140,7 @@ index 2f36a17ef96e..42cdf1668378 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75961,7 +76235,7 @@ index 2f36a17ef96e..42cdf1668378 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76048,16 +76322,17 @@ index 2f36a17ef96e..42cdf1668378 100644
  
  Library("data_tracker_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-index 01fdbebef3f1..78750a2c45d7 100644
+index 94e74f2cb4fc..f77b3b2c82e2 100644
 --- third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -76073,7 +76348,7 @@ index 01fdbebef3f1..78750a2c45d7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76168,7 +76443,7 @@ index 01fdbebef3f1..78750a2c45d7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76255,16 +76530,17 @@ index 01fdbebef3f1..78750a2c45d7 100644
  
  Library("interleaved_reassembly_streams_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-index abb5e61463bb..ca8b574b754c 100644
+index 6292051cd313..b1fa1cd16cd5 100644
 --- third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -76280,7 +76556,7 @@ index abb5e61463bb..ca8b574b754c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76375,7 +76651,7 @@ index abb5e61463bb..ca8b574b754c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76462,16 +76738,17 @@ index abb5e61463bb..ca8b574b754c 100644
  
  Library("reassembly_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
-index 5c644b5665bd..d1b59bdd2da1 100644
+index 223ed2e486d1..7655091bcaaa 100644
 --- third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -76487,7 +76764,7 @@ index 5c644b5665bd..d1b59bdd2da1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76582,7 +76859,7 @@ index 5c644b5665bd..d1b59bdd2da1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76608,7 +76885,7 @@ index 5c644b5665bd..d1b59bdd2da1 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -76650,16 +76927,17 @@ index 5c644b5665bd..d1b59bdd2da1 100644
 -
  Library("reassembly_streams_gn")
 diff --git third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-index b60265ff2dec..10b2024e6c32 100644
+index e334d07580f7..01dfe637adae 100644
 --- third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -76675,7 +76953,7 @@ index b60265ff2dec..10b2024e6c32 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76770,7 +77048,7 @@ index b60265ff2dec..10b2024e6c32 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -76857,16 +77135,17 @@ index b60265ff2dec..10b2024e6c32 100644
  
  Library("traditional_reassembly_streams_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
-index c5353dc2fcc8..34abeccb759b 100644
+index 5bcb8fd7da7e..27d6fd30bc08 100644
 --- third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -76882,7 +77161,7 @@ index c5353dc2fcc8..34abeccb759b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76977,7 +77256,7 @@ index c5353dc2fcc8..34abeccb759b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77003,7 +77282,7 @@ index c5353dc2fcc8..34abeccb759b 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -77045,16 +77324,17 @@ index c5353dc2fcc8..34abeccb759b 100644
 -
  Library("context_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-index bc87aa461b0d..4ae0b2d6bff5 100644
+index 2cebd6a0275c..fbf79ad7e806 100644
 --- third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -77070,7 +77350,7 @@ index bc87aa461b0d..4ae0b2d6bff5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77165,7 +77445,7 @@ index bc87aa461b0d..4ae0b2d6bff5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77252,16 +77532,17 @@ index bc87aa461b0d..4ae0b2d6bff5 100644
  
  Library("dcsctp_socket_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-index 4106ee13d217..a3f8705427b1 100644
+index 94759b913901..1113803749ff 100644
 --- third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -77277,7 +77558,7 @@ index 4106ee13d217..a3f8705427b1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77372,7 +77653,7 @@ index 4106ee13d217..a3f8705427b1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77459,16 +77740,17 @@ index 4106ee13d217..a3f8705427b1 100644
  
  Library("heartbeat_handler_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-index c900f2fd9491..70830cfb07de 100644
+index b5b79ff10d8e..a4a14f54b7a3 100644
 --- third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -77484,7 +77766,7 @@ index c900f2fd9491..70830cfb07de 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77579,7 +77861,7 @@ index c900f2fd9491..70830cfb07de 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77666,16 +77948,17 @@ index c900f2fd9491..70830cfb07de 100644
  
  Library("packet_sender_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-index 737f639236a3..e5f4c3f7489a 100644
+index 5bbfdb61d12a..9e2a34e28a94 100644
 --- third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -77691,7 +77974,7 @@ index 737f639236a3..e5f4c3f7489a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77786,7 +78069,7 @@ index 737f639236a3..e5f4c3f7489a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -77873,16 +78156,17 @@ index 737f639236a3..e5f4c3f7489a 100644
  
  Library("stream_reset_handler_gn")
 diff --git third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-index f9cd1cdea19c..96f1c1bf0f2c 100644
+index ae75873b8b09..3da6de2c5d3a 100644
 --- third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -77898,7 +78182,7 @@ index f9cd1cdea19c..96f1c1bf0f2c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77993,7 +78277,7 @@ index f9cd1cdea19c..96f1c1bf0f2c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78080,16 +78364,17 @@ index f9cd1cdea19c..96f1c1bf0f2c 100644
  
  Library("transmission_control_block_gn")
 diff --git third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-index 6fcab1231d30..5c9317afe4d3 100644
+index 959ffba824e7..1f1ca45cdb32 100644
 --- third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -78105,7 +78390,7 @@ index 6fcab1231d30..5c9317afe4d3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78200,7 +78485,7 @@ index 6fcab1231d30..5c9317afe4d3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78287,16 +78572,17 @@ index 6fcab1231d30..5c9317afe4d3 100644
  
  Library("task_queue_timeout_gn")
 diff --git third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-index df73a1896e86..719a013e1786 100644
+index eecc806bc928..3a3806dae7bd 100644
 --- third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -78312,7 +78598,7 @@ index df73a1896e86..719a013e1786 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78400,7 +78686,7 @@ index df73a1896e86..719a013e1786 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78487,16 +78773,17 @@ index df73a1896e86..719a013e1786 100644
  
  Library("timer_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-index df2340a8c348..3451c619b955 100644
+index b9759a66ff50..767ae19c60ce 100644
 --- third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -78512,7 +78799,7 @@ index df2340a8c348..3451c619b955 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78607,7 +78894,7 @@ index df2340a8c348..3451c619b955 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78694,16 +78981,17 @@ index df2340a8c348..3451c619b955 100644
  
  Library("outstanding_data_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-index 24095b9b7822..89c34a2b8d23 100644
+index 539704132f7a..dfd0bb5392f9 100644
 --- third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -78719,7 +79007,7 @@ index 24095b9b7822..89c34a2b8d23 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78814,7 +79102,7 @@ index 24095b9b7822..89c34a2b8d23 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -78901,16 +79189,17 @@ index 24095b9b7822..89c34a2b8d23 100644
  
  Library("retransmission_error_counter_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-index d79764e11a90..2265d6f5a636 100644
+index 2d477075e23c..13ebe92869fa 100644
 --- third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -78926,7 +79215,7 @@ index d79764e11a90..2265d6f5a636 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79021,7 +79310,7 @@ index d79764e11a90..2265d6f5a636 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79108,16 +79397,17 @@ index d79764e11a90..2265d6f5a636 100644
  
  Library("retransmission_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-index 01617b6f94ad..4ea9e30a8326 100644
+index 329aff01e6b1..9f9e700371c5 100644
 --- third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -79133,7 +79423,7 @@ index 01617b6f94ad..4ea9e30a8326 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79221,7 +79511,7 @@ index 01617b6f94ad..4ea9e30a8326 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79308,16 +79598,17 @@ index 01617b6f94ad..4ea9e30a8326 100644
  
  Library("retransmission_timeout_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-index 2b0975a91d11..241a5bce6bed 100644
+index 7d0b7b2fa7b0..3731481629c6 100644
 --- third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -79333,7 +79624,7 @@ index 2b0975a91d11..241a5bce6bed 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79428,7 +79719,7 @@ index 2b0975a91d11..241a5bce6bed 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79515,16 +79806,17 @@ index 2b0975a91d11..241a5bce6bed 100644
  
  Library("rr_send_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
-index a30ad32cc439..bf96c2aa78be 100644
+index 0b9745919c2e..7465135efccd 100644
 --- third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -79540,7 +79832,7 @@ index a30ad32cc439..bf96c2aa78be 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79624,18 +79916,11 @@ index a30ad32cc439..bf96c2aa78be 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79661,7 +79946,7 @@ index a30ad32cc439..bf96c2aa78be 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -79703,16 +79988,17 @@ index a30ad32cc439..bf96c2aa78be 100644
 -
  Library("send_queue_gn")
 diff --git third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-index 5452a33e24a7..391eee8efa91 100644
+index a21661685e13..00b85fd15269 100644
 --- third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
 +++ third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -79728,7 +80014,7 @@ index 5452a33e24a7..391eee8efa91 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79823,7 +80109,7 @@ index 5452a33e24a7..391eee8efa91 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -79910,16 +80196,17 @@ index 5452a33e24a7..391eee8efa91 100644
  
  Library("stream_scheduler_gn")
 diff --git third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-index 1a25bc4c9c08..88ed8df84a75 100644
+index ce3d904ce703..1658cf4f9cee 100644
 --- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -79935,7 +80222,7 @@ index 1a25bc4c9c08..88ed8df84a75 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80031,7 +80318,7 @@ index 1a25bc4c9c08..88ed8df84a75 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80118,16 +80405,17 @@ index 1a25bc4c9c08..88ed8df84a75 100644
  
  Library("async_dns_resolver_gn")
 diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-index be56799b7857..0297bad15075 100644
+index e39300d8e434..27915cf133a2 100644
 --- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -80143,7 +80431,7 @@ index be56799b7857..0297bad15075 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80227,7 +80515,7 @@ index be56799b7857..0297bad15075 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80253,7 +80541,7 @@ index be56799b7857..0297bad15075 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -80295,16 +80583,17 @@ index be56799b7857..0297bad15075 100644
 -
  Library("async_packet_socket_gn")
 diff --git third_party/libwebrtc/rtc_base/base64_gn/moz.build third_party/libwebrtc/rtc_base/base64_gn/moz.build
-index d726a432a8f7..171770ac0390 100644
+index ad9d506842cd..fd0e5f49d265 100644
 --- third_party/libwebrtc/rtc_base/base64_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/base64_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -80320,7 +80609,7 @@ index d726a432a8f7..171770ac0390 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80339,10 +80628,6 @@ index d726a432a8f7..171770ac0390 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -80408,7 +80693,7 @@ index d726a432a8f7..171770ac0390 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80466,10 +80751,10 @@ index d726a432a8f7..171770ac0390 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -80480,10 +80765,10 @@ index d726a432a8f7..171770ac0390 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -80495,16 +80780,17 @@ index d726a432a8f7..171770ac0390 100644
  
  Library("base64_gn")
 diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index 50cb2ab77aea..710d01f74d07 100644
+index 4f5f3cf4e613..9a870bf35314 100644
 --- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -80520,7 +80806,7 @@ index 50cb2ab77aea..710d01f74d07 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80608,7 +80894,7 @@ index 50cb2ab77aea..710d01f74d07 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80695,16 +80981,17 @@ index 50cb2ab77aea..710d01f74d07 100644
  
  Library("bit_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-index b9f2220d4f48..6924940a7cf4 100644
+index 3367568af134..ebfed8b3ad48 100644
 --- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -80720,7 +81007,7 @@ index b9f2220d4f48..6924940a7cf4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80815,7 +81102,7 @@ index b9f2220d4f48..6924940a7cf4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -80902,16 +81189,17 @@ index b9f2220d4f48..6924940a7cf4 100644
  
  Library("bitrate_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index 26817ca09a7d..226a24f7107e 100644
+index 8af521a48c13..6fc2f00174ac 100644
 --- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -80927,7 +81215,7 @@ index 26817ca09a7d..226a24f7107e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81015,7 +81303,7 @@ index 26817ca09a7d..226a24f7107e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81102,16 +81390,17 @@ index 26817ca09a7d..226a24f7107e 100644
  
  Library("bitstream_reader_gn")
 diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-index a454fcb0ee69..2925b692abfc 100644
+index baca94004381..96026c60bb12 100644
 --- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -81127,7 +81416,7 @@ index a454fcb0ee69..2925b692abfc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81215,7 +81504,7 @@ index a454fcb0ee69..2925b692abfc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81241,7 +81530,7 @@ index a454fcb0ee69..2925b692abfc 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -81283,16 +81572,17 @@ index a454fcb0ee69..2925b692abfc 100644
 -
  Library("buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-index 23d723da5d0b..0cf3653ec23b 100644
+index cc486afcc220..4eb7f6a5a07a 100644
 --- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -81308,7 +81598,7 @@ index 23d723da5d0b..0cf3653ec23b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81396,7 +81686,7 @@ index 23d723da5d0b..0cf3653ec23b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81483,16 +81773,17 @@ index 23d723da5d0b..0cf3653ec23b 100644
  
  Library("byte_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-index 74f384c22bb6..0e5f9e105309 100644
+index 73dbbfaaad5c..7deea00c4ec5 100644
 --- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -81508,7 +81799,7 @@ index 74f384c22bb6..0e5f9e105309 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81527,6 +81818,10 @@ index 74f384c22bb6..0e5f9e105309 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -81592,7 +81887,7 @@ index 74f384c22bb6..0e5f9e105309 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81618,7 +81913,7 @@ index 74f384c22bb6..0e5f9e105309 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -81660,16 +81955,17 @@ index 74f384c22bb6..0e5f9e105309 100644
 -
  Library("byte_order_gn")
 diff --git third_party/libwebrtc/rtc_base/callback_list_gn/moz.build third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
-index a511d04bcd7a..6ff38bf3e76e 100644
+index 756045b2ae64..d325515dbfc9 100644
 --- third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -81685,7 +81981,7 @@ index a511d04bcd7a..6ff38bf3e76e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81773,7 +82069,7 @@ index a511d04bcd7a..6ff38bf3e76e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81860,16 +82156,17 @@ index a511d04bcd7a..6ff38bf3e76e 100644
  
  Library("callback_list_gn")
 diff --git third_party/libwebrtc/rtc_base/callback_list_with_locks_gn/moz.build third_party/libwebrtc/rtc_base/callback_list_with_locks_gn/moz.build
-index 37a2220aa6d4..c22e77a445ae 100644
+index d6bc8ac92531..adeb5fe14ec5 100644
 --- third_party/libwebrtc/rtc_base/callback_list_with_locks_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/callback_list_with_locks_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -81885,7 +82182,7 @@ index 37a2220aa6d4..c22e77a445ae 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81973,7 +82270,7 @@ index 37a2220aa6d4..c22e77a445ae 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -81999,7 +82296,7 @@ index 37a2220aa6d4..c22e77a445ae 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -82041,16 +82338,17 @@ index 37a2220aa6d4..c22e77a445ae 100644
 -
  Library("callback_list_with_locks_gn")
 diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index 8e1b70c997d0..3f23845f5297 100644
+index c2f4b7b7d438..fdf490222476 100644
 --- third_party/libwebrtc/rtc_base/checks_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -82066,7 +82364,7 @@ index 8e1b70c997d0..3f23845f5297 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82154,7 +82452,7 @@ index 8e1b70c997d0..3f23845f5297 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82241,16 +82539,17 @@ index 8e1b70c997d0..3f23845f5297 100644
  
  Library("checks_gn")
 diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-index 88cee7f44516..76da6d251187 100644
+index c48c41b1f2b1..d67d418d2d30 100644
 --- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -82266,7 +82565,7 @@ index 88cee7f44516..76da6d251187 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82350,7 +82649,7 @@ index 88cee7f44516..76da6d251187 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82376,7 +82675,7 @@ index 88cee7f44516..76da6d251187 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -82418,16 +82717,17 @@ index 88cee7f44516..76da6d251187 100644
 -
  Library("compile_assert_c_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-index c7bd4f21f6e3..ebd7d2e99290 100644
+index fbc2ff004ac4..854dece0fe4f 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -82443,7 +82743,7 @@ index c7bd4f21f6e3..ebd7d2e99290 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82531,7 +82831,7 @@ index c7bd4f21f6e3..ebd7d2e99290 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82618,16 +82918,17 @@ index c7bd4f21f6e3..ebd7d2e99290 100644
  
  Library("flat_containers_internal_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-index a0c76957de3d..ccb70c641b40 100644
+index 1c2c673d784a..2f9057117d9b 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -82643,7 +82944,7 @@ index a0c76957de3d..ccb70c641b40 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82731,7 +83032,7 @@ index a0c76957de3d..ccb70c641b40 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82757,7 +83058,7 @@ index a0c76957de3d..ccb70c641b40 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -82799,16 +83100,17 @@ index a0c76957de3d..ccb70c641b40 100644
 -
  Library("flat_map_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-index 9705d844e9e6..c603c3162a19 100644
+index f1c7f92c5e83..5e81459bd6f4 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -82824,7 +83126,7 @@ index 9705d844e9e6..c603c3162a19 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82912,7 +83214,7 @@ index 9705d844e9e6..c603c3162a19 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -82938,7 +83240,7 @@ index 9705d844e9e6..c603c3162a19 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -82980,16 +83282,17 @@ index 9705d844e9e6..c603c3162a19 100644
 -
  Library("flat_set_gn")
 diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-index 7c795ea71573..f9d453b462bf 100644
+index f4367aad86ff..c6cb47329913 100644
 --- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -83005,7 +83308,7 @@ index 7c795ea71573..f9d453b462bf 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83093,7 +83396,7 @@ index 7c795ea71573..f9d453b462bf 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83180,16 +83483,17 @@ index 7c795ea71573..f9d453b462bf 100644
  
  Library("copy_on_write_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
-index 2b0cf4fb67b1..0e53770baf5f 100644
+index b57fea776a05..99da64c68eb4 100644
 --- third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/cpu_info_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -83205,7 +83509,7 @@ index 2b0cf4fb67b1..0e53770baf5f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83300,7 +83604,7 @@ index 2b0cf4fb67b1..0e53770baf5f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83387,16 +83691,17 @@ index 2b0cf4fb67b1..0e53770baf5f 100644
  
  Library("cpu_info_gn")
 diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index c032b1a986a3..3a591ec6e96c 100644
+index 6ee06e70525f..ab6f969d6006 100644
 --- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -83412,7 +83717,7 @@ index c032b1a986a3..3a591ec6e96c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83500,7 +83805,7 @@ index c032b1a986a3..3a591ec6e96c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83587,16 +83892,17 @@ index c032b1a986a3..3a591ec6e96c 100644
  
  Library("criticalsection_gn")
 diff --git third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
-index 266f0b403372..a7632439b491 100644
+index 384477eaee0f..c16f49fef720 100644
 --- third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/denormal_disabler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -83612,7 +83918,7 @@ index 266f0b403372..a7632439b491 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83700,7 +84006,7 @@ index 266f0b403372..a7632439b491 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83787,16 +84093,17 @@ index 266f0b403372..a7632439b491 100644
  
  Library("denormal_disabler_gn")
 diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index f947044a70c5..cef2ec4afcd9 100644
+index 81ec5f4a9497..fe130b0219be 100644
 --- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -83812,7 +84119,7 @@ index f947044a70c5..cef2ec4afcd9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83900,7 +84207,7 @@ index f947044a70c5..cef2ec4afcd9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -83926,7 +84233,7 @@ index f947044a70c5..cef2ec4afcd9 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -83968,16 +84275,17 @@ index f947044a70c5..cef2ec4afcd9 100644
 -
  Library("divide_round_gn")
 diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-index a21e8af3a982..d16a56b3c8be 100644
+index 043d231e4505..8e7514245a65 100644
 --- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -83993,7 +84301,7 @@ index a21e8af3a982..d16a56b3c8be 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84077,7 +84385,7 @@ index a21e8af3a982..d16a56b3c8be 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84103,7 +84411,7 @@ index a21e8af3a982..d16a56b3c8be 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -84145,16 +84453,17 @@ index a21e8af3a982..d16a56b3c8be 100644
 -
  Library("dscp_gn")
 diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-index d70f8d5bf102..0ed150dc70b7 100644
+index d65f595518b0..9286aa3d82ba 100644
 --- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -84170,7 +84479,7 @@ index d70f8d5bf102..0ed150dc70b7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84265,7 +84574,7 @@ index d70f8d5bf102..0ed150dc70b7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84352,16 +84661,17 @@ index d70f8d5bf102..0ed150dc70b7 100644
  
  Library("event_tracer_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index d5ccba752185..1353fd9971e1 100644
+index 6ac1eeb8e971..2e1ce58efa2f 100644
 --- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -84377,7 +84687,7 @@ index d5ccba752185..1353fd9971e1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84472,7 +84782,7 @@ index d5ccba752185..1353fd9971e1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84559,16 +84869,17 @@ index d5ccba752185..1353fd9971e1 100644
  
  Library("alr_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index cce401c6f0b3..55178aa20743 100644
+index 99e706bb79da..9b1f5112a3e9 100644
 --- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -84584,7 +84895,7 @@ index cce401c6f0b3..55178aa20743 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84679,7 +84990,7 @@ index cce401c6f0b3..55178aa20743 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84765,17 +85076,226 @@ index cce401c6f0b3..55178aa20743 100644
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
  Library("balanced_degradation_settings_gn")
+diff --git third_party/libwebrtc/rtc_base/experiments/corruption_detection_frame_selector_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/corruption_detection_frame_selector_settings_gn/moz.build
+index d3e1c0ba88dc..100e700405b7 100644
+--- third_party/libwebrtc/rtc_base/experiments/corruption_detection_frame_selector_settings_gn/moz.build
++++ third_party/libwebrtc/rtc_base/experiments/corruption_detection_frame_selector_settings_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
+     DEFINES["__ARM_NEON__"] = "1"
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("corruption_detection_frame_selector_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-index ebeb77db3013..bf97dcb17792 100644
+index 449460bf3b79..b0812778318d 100644
 --- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -84791,7 +85311,7 @@ index ebeb77db3013..bf97dcb17792 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84886,7 +85406,7 @@ index ebeb77db3013..bf97dcb17792 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -84973,16 +85493,17 @@ index ebeb77db3013..bf97dcb17792 100644
  
  Library("encoder_info_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/encoder_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_speed_experiment_gn/moz.build
-index 36b502e0d1cb..4814c620bf43 100644
+index dfd0450c4ae6..25c8daed28cf 100644
 --- third_party/libwebrtc/rtc_base/experiments/encoder_speed_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/encoder_speed_experiment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -84998,7 +85519,7 @@ index 36b502e0d1cb..4814c620bf43 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85093,7 +85614,7 @@ index 36b502e0d1cb..4814c620bf43 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85180,16 +85701,17 @@ index 36b502e0d1cb..4814c620bf43 100644
  
  Library("encoder_speed_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index c6806c13de0a..18300e83b968 100644
+index d6ee81093af9..1da7f51844e7 100644
 --- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -85205,7 +85727,7 @@ index c6806c13de0a..18300e83b968 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,93 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85300,7 +85822,7 @@ index c6806c13de0a..18300e83b968 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -144,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85387,16 +85909,17 @@ index c6806c13de0a..18300e83b968 100644
  
  Library("field_trial_parser_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index 75a2fd41366c..ea85ffff3111 100644
+index 497284def49f..8a6bee0ab7dc 100644
 --- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -85412,7 +85935,7 @@ index 75a2fd41366c..ea85ffff3111 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85507,7 +86030,7 @@ index 75a2fd41366c..ea85ffff3111 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85594,16 +86117,17 @@ index 75a2fd41366c..ea85ffff3111 100644
  
  Library("keyframe_interval_settings_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index 07a834739abc..6526a4d69c90 100644
+index 88cfeb499843..9cdaecd05b2c 100644
 --- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -85619,7 +86143,7 @@ index 07a834739abc..6526a4d69c90 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85714,7 +86238,7 @@ index 07a834739abc..6526a4d69c90 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -85801,16 +86325,17 @@ index 07a834739abc..6526a4d69c90 100644
  
  Library("min_video_bitrate_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-index c804a04edc64..6270ba546b1f 100644
+index ea5834e5fde9..4ec63b0acc00 100644
 --- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -85826,7 +86351,7 @@ index c804a04edc64..6270ba546b1f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85921,7 +86446,7 @@ index c804a04edc64..6270ba546b1f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86008,16 +86533,17 @@ index c804a04edc64..6270ba546b1f 100644
  
  Library("normalize_simulcast_size_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/psnr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/psnr_experiment_gn/moz.build
-index 290dcad7c5ed..5ce2355b71dd 100644
+index 4d66b4f08e3e..c5035bee9816 100644
 --- third_party/libwebrtc/rtc_base/experiments/psnr_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/psnr_experiment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -86033,7 +86559,7 @@ index 290dcad7c5ed..5ce2355b71dd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86128,7 +86654,7 @@ index 290dcad7c5ed..5ce2355b71dd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86215,16 +86741,17 @@ index 290dcad7c5ed..5ce2355b71dd 100644
  
  Library("psnr_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index 4b8ce6541aad..fca99f2e0a66 100644
+index c1447e9671d1..4191b5e491e5 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -86240,7 +86767,7 @@ index 4b8ce6541aad..fca99f2e0a66 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86335,7 +86862,7 @@ index 4b8ce6541aad..fca99f2e0a66 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86422,16 +86949,17 @@ index 4b8ce6541aad..fca99f2e0a66 100644
  
  Library("quality_scaler_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index 0930ef0477bc..175e3ff531e2 100644
+index cc6a09e579c8..3ffb4a014b7f 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -86447,7 +86975,7 @@ index 0930ef0477bc..175e3ff531e2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86542,7 +87070,7 @@ index 0930ef0477bc..175e3ff531e2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86629,16 +87157,17 @@ index 0930ef0477bc..175e3ff531e2 100644
  
  Library("quality_scaling_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index be79eb29ffe7..092a2cb2d143 100644
+index fe89d7e1a993..fad02d326f14 100644
 --- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -86654,7 +87183,7 @@ index be79eb29ffe7..092a2cb2d143 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86749,7 +87278,7 @@ index be79eb29ffe7..092a2cb2d143 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -86836,16 +87365,17 @@ index be79eb29ffe7..092a2cb2d143 100644
  
  Library("rate_control_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-index 6172f4d96dfa..ad4e108a796b 100644
+index 0c94c24371d6..524a17a3b411 100644
 --- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -86861,7 +87391,7 @@ index 6172f4d96dfa..ad4e108a796b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86956,7 +87486,7 @@ index 6172f4d96dfa..ad4e108a796b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87043,16 +87573,17 @@ index 6172f4d96dfa..ad4e108a796b 100644
  
  Library("frequency_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index 82a66f9119cd..96a8ea39c266 100644
+index 0b583730c8b7..318b13d209c9 100644
 --- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -87068,7 +87599,7 @@ index 82a66f9119cd..96a8ea39c266 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87152,7 +87683,7 @@ index 82a66f9119cd..96a8ea39c266 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87178,7 +87709,7 @@ index 82a66f9119cd..96a8ea39c266 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -87220,16 +87751,17 @@ index 82a66f9119cd..96a8ea39c266 100644
 -
  Library("gtest_prod_gn")
 diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-index 833688440249..f10a11715812 100644
+index 292e3581e964..2d44637ad4bb 100644
 --- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -87245,7 +87777,7 @@ index 833688440249..f10a11715812 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87333,7 +87865,7 @@ index 833688440249..f10a11715812 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87421,10 +87953,10 @@ index 833688440249..f10a11715812 100644
  Library("histogram_percentile_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
 deleted file mode 100644
-index 7b10ad2fedfe..000000000000
+index 4bb9fb83e624..000000000000
 --- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
 +++ /dev/null
-@@ -1,95 +0,0 @@
+@@ -1,96 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -87445,6 +87977,7 @@ index 7b10ad2fedfe..000000000000
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ANDROID"] = True
 -DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -87521,16 +88054,17 @@ index 7b10ad2fedfe..000000000000
 -
 -Library("ifaddrs_android_gn")
 diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index 6456e230bfa9..8d9f02cb22b4 100644
+index 036104695aad..4bdd317bb3d5 100644
 --- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -87546,7 +88080,7 @@ index 6456e230bfa9..8d9f02cb22b4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87630,7 +88164,7 @@ index 6456e230bfa9..8d9f02cb22b4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87656,7 +88190,7 @@ index 6456e230bfa9..8d9f02cb22b4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -87698,16 +88232,17 @@ index 6456e230bfa9..8d9f02cb22b4 100644
 -
  Library("ignore_wundef_gn")
 diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-index 202fd27525b6..77529d538252 100644
+index 1be075310cd3..8632ae3274a1 100644
 --- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -87723,7 +88258,7 @@ index 202fd27525b6..77529d538252 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87818,7 +88353,7 @@ index 202fd27525b6..77529d538252 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -87905,10 +88440,10 @@ index 202fd27525b6..77529d538252 100644
  
  Library("ip_address_gn")
 diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 659c105eeb02..d4b59daa7d6f 100644
+index e989579f9dae..a8d03abcfc46 100644
 --- third_party/libwebrtc/rtc_base/logging_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,14 +13,23 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
@@ -87916,6 +88451,7 @@ index 659c105eeb02..d4b59daa7d6f 100644
 +DEFINES["USE_OZONE"] = "1"
  DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -87931,7 +88467,7 @@ index 659c105eeb02..d4b59daa7d6f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88026,7 +88562,7 @@ index 659c105eeb02..d4b59daa7d6f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88113,16 +88649,17 @@ index 659c105eeb02..d4b59daa7d6f 100644
  
  Library("logging_gn")
 diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index c12cf66ea418..ca5ca6a0d967 100644
+index b39c3266038d..dbc88c02d8de 100644
 --- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -88138,7 +88675,7 @@ index c12cf66ea418..ca5ca6a0d967 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88222,7 +88759,7 @@ index c12cf66ea418..ca5ca6a0d967 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88248,7 +88785,7 @@ index c12cf66ea418..ca5ca6a0d967 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88290,16 +88827,17 @@ index c12cf66ea418..ca5ca6a0d967 100644
 -
  Library("macromagic_gn")
 diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index 764b220dcf8f..2a12495bcdf6 100644
+index 2e07487005de..f173af8bc89e 100644
 --- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -88315,7 +88853,7 @@ index 764b220dcf8f..2a12495bcdf6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88403,7 +88941,7 @@ index 764b220dcf8f..2a12495bcdf6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88490,16 +89028,17 @@ index 764b220dcf8f..2a12495bcdf6 100644
  
  Library("aligned_malloc_gn")
 diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index 0750ed9e64f9..e741274c96a3 100644
+index 2ef56bbe4adc..4aa9fac0d680 100644
 --- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -88515,7 +89054,7 @@ index 0750ed9e64f9..e741274c96a3 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88603,7 +89142,7 @@ index 0750ed9e64f9..e741274c96a3 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88629,7 +89168,7 @@ index 0750ed9e64f9..e741274c96a3 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88671,16 +89210,17 @@ index 0750ed9e64f9..e741274c96a3 100644
 -
  Library("mod_ops_gn")
 diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-index 5461d491dff4..3f8532394ef4 100644
+index 4eb717e25f99..dc6da89e9fc0 100644
 --- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -88696,7 +89236,7 @@ index 5461d491dff4..3f8532394ef4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88784,7 +89324,7 @@ index 5461d491dff4..3f8532394ef4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -88810,7 +89350,7 @@ index 5461d491dff4..3f8532394ef4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -88852,16 +89392,17 @@ index 5461d491dff4..3f8532394ef4 100644
 -
  Library("moving_max_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-index 9ec122a9ce5f..27ce5039d3c6 100644
+index 6cb4c2df6254..dbe25e4eea2b 100644
 --- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -88877,7 +89418,7 @@ index 9ec122a9ce5f..27ce5039d3c6 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88972,7 +89513,7 @@ index 9ec122a9ce5f..27ce5039d3c6 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89059,16 +89600,17 @@ index 9ec122a9ce5f..27ce5039d3c6 100644
  
  Library("net_helpers_gn")
 diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index d3b3da72d146..c44bd3b53ae0 100644
+index b9c50958d282..c102407b73aa 100644
 --- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -89084,7 +89626,7 @@ index d3b3da72d146..c44bd3b53ae0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89168,7 +89710,7 @@ index d3b3da72d146..c44bd3b53ae0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89255,16 +89797,17 @@ index d3b3da72d146..c44bd3b53ae0 100644
  
  Library("sent_packet_gn")
 diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-index 31053e12ea4a..fe1e8a9ea932 100644
+index ed2917f79a43..c1f9a3689915 100644
 --- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -89280,7 +89823,7 @@ index 31053e12ea4a..fe1e8a9ea932 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89368,7 +89911,7 @@ index 31053e12ea4a..fe1e8a9ea932 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89455,16 +89998,17 @@ index 31053e12ea4a..fe1e8a9ea932 100644
  
  Library("network_constants_gn")
 diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-index 06557cf9497d..db90cbe755bb 100644
+index 55098c9cf0de..5e982a51089f 100644
 --- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -89480,7 +90024,7 @@ index 06557cf9497d..db90cbe755bb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89568,7 +90112,7 @@ index 06557cf9497d..db90cbe755bb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89655,16 +90199,17 @@ index 06557cf9497d..db90cbe755bb 100644
  
  Library("network_route_gn")
 diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-index beffd8445b78..693b43b106dc 100644
+index 5c351cc0ccdb..2694e90beaa5 100644
 --- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -89680,7 +90225,7 @@ index beffd8445b78..693b43b106dc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89776,7 +90321,7 @@ index beffd8445b78..693b43b106dc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -89863,16 +90408,17 @@ index beffd8445b78..693b43b106dc 100644
  
  Library("null_socket_server_gn")
 diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-index df5836570385..150831277c97 100644
+index ab3c2d21320d..12def243b06f 100644
 --- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -89888,7 +90434,7 @@ index df5836570385..150831277c97 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89976,7 +90522,7 @@ index df5836570385..150831277c97 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90002,7 +90548,7 @@ index df5836570385..150831277c97 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -90044,16 +90590,17 @@ index df5836570385..150831277c97 100644
 -
  Library("one_time_event_gn")
 diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index 9df9a5970796..96b61f54cadd 100644
+index aaca440dab7f..a51dbb0cdc5e 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -90069,7 +90616,7 @@ index 9df9a5970796..96b61f54cadd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90164,7 +90711,7 @@ index 9df9a5970796..96b61f54cadd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90251,16 +90798,17 @@ index 9df9a5970796..96b61f54cadd 100644
  
  Library("platform_thread_gn")
 diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index 483fc3f4157a..de5e498e7276 100644
+index 91c7f3d9efda..da346366dc22 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -90276,7 +90824,7 @@ index 483fc3f4157a..de5e498e7276 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90364,7 +90912,7 @@ index 483fc3f4157a..de5e498e7276 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90451,16 +90999,17 @@ index 483fc3f4157a..de5e498e7276 100644
  
  Library("platform_thread_types_gn")
 diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index 978991e022cc..9b750326f9fd 100644
+index 1e5d7569d858..b95a0a3684da 100644
 --- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -90476,7 +91025,7 @@ index 978991e022cc..9b750326f9fd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90560,7 +91109,7 @@ index 978991e022cc..9b750326f9fd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90586,7 +91135,7 @@ index 978991e022cc..9b750326f9fd 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -90628,16 +91177,17 @@ index 978991e022cc..9b750326f9fd 100644
 -
  Library("protobuf_utils_gn")
 diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-index 40f116cdf02f..fd5b113818a0 100644
+index 00f266ca9720..74b0fd12be06 100644
 --- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -90653,7 +91203,7 @@ index 40f116cdf02f..fd5b113818a0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90741,7 +91291,7 @@ index 40f116cdf02f..fd5b113818a0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -90828,16 +91378,17 @@ index 40f116cdf02f..fd5b113818a0 100644
  
  Library("race_checker_gn")
 diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
-index 91128f649d33..994b0123cb5b 100644
+index a06c491cb8b4..e9f3f776ab31 100644
 --- third_party/libwebrtc/rtc_base/random_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/random_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -90853,7 +91404,7 @@ index 91128f649d33..994b0123cb5b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90941,7 +91492,7 @@ index 91128f649d33..994b0123cb5b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91028,16 +91579,17 @@ index 91128f649d33..994b0123cb5b 100644
  
  Library("random_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index e41ea09b0ea2..4599539f7bbd 100644
+index 20e93a15eeb2..5a3400a8880d 100644
 --- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -91053,7 +91605,7 @@ index e41ea09b0ea2..4599539f7bbd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91148,7 +91700,7 @@ index e41ea09b0ea2..4599539f7bbd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91235,16 +91787,17 @@ index e41ea09b0ea2..4599539f7bbd 100644
  
  Library("rate_limiter_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-index 71d485c13568..a544f01597c0 100644
+index 82f95010dfde..e992938d3761 100644
 --- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -91260,7 +91813,7 @@ index 71d485c13568..a544f01597c0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91355,7 +91908,7 @@ index 71d485c13568..a544f01597c0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91442,16 +91995,17 @@ index 71d485c13568..a544f01597c0 100644
  
  Library("rate_statistics_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-index ad3d6f9bb607..c4fea54c2bff 100644
+index b2f03f4d68f6..72da4f323fbe 100644
 --- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -91467,7 +92021,7 @@ index ad3d6f9bb607..c4fea54c2bff 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91555,7 +92109,7 @@ index ad3d6f9bb607..c4fea54c2bff 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91642,16 +92196,17 @@ index ad3d6f9bb607..c4fea54c2bff 100644
  
  Library("rate_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index 310f48f6fe48..7967acbb2978 100644
+index 09bc29afce1b..193905c3ed3e 100644
 --- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -91667,7 +92222,7 @@ index 310f48f6fe48..7967acbb2978 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91751,7 +92306,7 @@ index 310f48f6fe48..7967acbb2978 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91777,7 +92332,7 @@ index 310f48f6fe48..7967acbb2978 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -91819,16 +92374,17 @@ index 310f48f6fe48..7967acbb2978 100644
 -
  Library("refcount_gn")
 diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-index 8e1ad3270d6a..c1de16b7663d 100644
+index 76080f76dfbc..c5e6a4c5d461 100644
 --- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -91844,7 +92400,7 @@ index 8e1ad3270d6a..c1de16b7663d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91932,7 +92488,7 @@ index 8e1ad3270d6a..c1de16b7663d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -91958,7 +92514,7 @@ index 8e1ad3270d6a..c1de16b7663d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -92000,16 +92556,17 @@ index 8e1ad3270d6a..c1de16b7663d 100644
 -
  Library("rolling_accumulator_gn")
 diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-index 5a2ddf7b5535..52f42d277da4 100644
+index 48685f3f630c..704e8001bac8 100644
 --- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -92025,7 +92582,7 @@ index 5a2ddf7b5535..52f42d277da4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92113,7 +92670,7 @@ index 5a2ddf7b5535..52f42d277da4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92200,16 +92757,17 @@ index 5a2ddf7b5535..52f42d277da4 100644
  
  Library("rtc_event_gn")
 diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index 31383355abe5..41f7c59fb1c4 100644
+index f988d869c9be..b3e3c933f092 100644
 --- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -92225,7 +92783,7 @@ index 31383355abe5..41f7c59fb1c4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,86 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92313,7 +92871,7 @@ index 31383355abe5..41f7c59fb1c4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -136,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92400,16 +92958,17 @@ index 31383355abe5..41f7c59fb1c4 100644
  
  Library("rtc_numerics_gn")
 diff --git third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
-index 6f2a3c9ce63d..ee9aa8bf7c35 100644
+index 1821e61f09c0..003f5520689b 100644
 --- third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtp_to_ntp_estimator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -92425,7 +92984,7 @@ index 6f2a3c9ce63d..ee9aa8bf7c35 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92520,7 +93079,7 @@ index 6f2a3c9ce63d..ee9aa8bf7c35 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92607,16 +93166,17 @@ index 6f2a3c9ce63d..ee9aa8bf7c35 100644
  
  Library("rtp_to_ntp_estimator_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index 1fccec1b3d1d..7a289dcd81cb 100644
+index 72858c633cde..020316587d7d 100644
 --- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -92632,7 +93192,7 @@ index 1fccec1b3d1d..7a289dcd81cb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92716,7 +93276,7 @@ index 1fccec1b3d1d..7a289dcd81cb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92742,7 +93302,7 @@ index 1fccec1b3d1d..7a289dcd81cb 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -92784,16 +93344,17 @@ index 1fccec1b3d1d..7a289dcd81cb 100644
 -
  Library("safe_compare_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index 4b1fe52dbb29..37d087dca314 100644
+index 02171db7e818..5825454ab146 100644
 --- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -92809,7 +93370,7 @@ index 4b1fe52dbb29..37d087dca314 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92897,7 +93458,7 @@ index 4b1fe52dbb29..37d087dca314 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -92923,7 +93484,7 @@ index 4b1fe52dbb29..37d087dca314 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -92965,16 +93526,17 @@ index 4b1fe52dbb29..37d087dca314 100644
 -
  Library("safe_conversions_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index 19c9d560e6b0..b02b90eb7f8a 100644
+index 2ab07fbc57d5..651fe05a6bd5 100644
 --- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -92990,7 +93552,7 @@ index 19c9d560e6b0..b02b90eb7f8a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93078,7 +93640,7 @@ index 19c9d560e6b0..b02b90eb7f8a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93104,7 +93666,7 @@ index 19c9d560e6b0..b02b90eb7f8a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -93146,16 +93708,17 @@ index 19c9d560e6b0..b02b90eb7f8a 100644
 -
  Library("safe_minmax_gn")
 diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-index 2d6ffc700392..5657837196da 100644
+index 9a639ec32ebe..3bf258d497cd 100644
 --- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -93171,7 +93734,7 @@ index 2d6ffc700392..5657837196da 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93259,7 +93822,7 @@ index 2d6ffc700392..5657837196da 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93346,16 +93909,17 @@ index 2d6ffc700392..5657837196da 100644
  
  Library("sample_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-index 89ba6be7893d..65fc7a6bdcca 100644
+index ade0382d6bca..04ff4236fde5 100644
 --- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -93371,7 +93935,7 @@ index 89ba6be7893d..65fc7a6bdcca 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93455,7 +94019,7 @@ index 89ba6be7893d..65fc7a6bdcca 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93481,7 +94045,7 @@ index 89ba6be7893d..65fc7a6bdcca 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -93523,16 +94087,17 @@ index 89ba6be7893d..65fc7a6bdcca 100644
 -
  Library("sanitizer_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-index 41f48aed0ade..0a3d78361f9c 100644
+index 17fa1967e0b3..3babf71a7a83 100644
 --- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -93548,7 +94113,7 @@ index 41f48aed0ade..0a3d78361f9c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93644,7 +94209,7 @@ index 41f48aed0ade..0a3d78361f9c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93731,16 +94296,17 @@ index 41f48aed0ade..0a3d78361f9c 100644
  
  Library("socket_address_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-index 7bb549d27ba9..4a07e285ccb1 100644
+index 89f4cd70b157..b9034e2bdeea 100644
 --- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -93756,7 +94322,7 @@ index 7bb549d27ba9..4a07e285ccb1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93852,7 +94418,7 @@ index 7bb549d27ba9..4a07e285ccb1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -93878,7 +94444,7 @@ index 7bb549d27ba9..4a07e285ccb1 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -93920,16 +94486,17 @@ index 7bb549d27ba9..4a07e285ccb1 100644
 -
  Library("socket_factory_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
-index d2ec55c32168..cccc8cb30d11 100644
+index f763238b05a5..62744793ea9a 100644
 --- third_party/libwebrtc/rtc_base/socket_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -93945,7 +94512,7 @@ index d2ec55c32168..cccc8cb30d11 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94041,7 +94608,7 @@ index d2ec55c32168..cccc8cb30d11 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94128,16 +94695,17 @@ index d2ec55c32168..cccc8cb30d11 100644
  
  Library("socket_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-index ac5a10fa4495..4d79666d6d70 100644
+index 349e298fa36b..646da3d0c4e9 100644
 --- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -94153,7 +94721,7 @@ index ac5a10fa4495..4d79666d6d70 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94249,7 +94817,7 @@ index ac5a10fa4495..4d79666d6d70 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94275,7 +94843,7 @@ index ac5a10fa4495..4d79666d6d70 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -94317,16 +94885,17 @@ index ac5a10fa4495..4d79666d6d70 100644
 -
  Library("socket_server_gn")
 diff --git third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
-index d8170674c353..c2cf27cc74ea 100644
+index f8a078682384..c1761af468e1 100644
 --- third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -94342,7 +94911,7 @@ index d8170674c353..c2cf27cc74ea 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94426,7 +94995,7 @@ index d8170674c353..c2cf27cc74ea 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94452,7 +95021,7 @@ index d8170674c353..c2cf27cc74ea 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -94494,16 +95063,17 @@ index d8170674c353..c2cf27cc74ea 100644
 -
  Library("ssl_adapter_gn")
 diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index 138bd260049f..204742c0f9e7 100644
+index d57f07f050a9..321043066780 100644
 --- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -94519,7 +95089,7 @@ index 138bd260049f..204742c0f9e7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -50,86 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,86 +60,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94607,7 +95177,7 @@ index 138bd260049f..204742c0f9e7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,82 +68,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94694,16 +95264,17 @@ index 138bd260049f..204742c0f9e7 100644
  
  Library("stringutils_gn")
 diff --git third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
-index 6eaec231f687..274bcc3ee6a5 100644
+index 9100e2d42ae0..e61209bf2f3a 100644
 --- third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -94719,7 +95290,7 @@ index 6eaec231f687..274bcc3ee6a5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94803,7 +95374,7 @@ index 6eaec231f687..274bcc3ee6a5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -94829,7 +95400,7 @@ index 6eaec231f687..274bcc3ee6a5 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -94871,16 +95442,17 @@ index 6eaec231f687..274bcc3ee6a5 100644
 -
  Library("strong_alias_gn")
 diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-index 45f5b0fe25db..94b1bec9ec91 100644
+index b049ec92262f..0e8fbf3bd6d6 100644
 --- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -94896,7 +95468,7 @@ index 45f5b0fe25db..94b1bec9ec91 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94984,7 +95556,7 @@ index 45f5b0fe25db..94b1bec9ec91 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95010,7 +95582,7 @@ index 45f5b0fe25db..94b1bec9ec91 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -95052,16 +95624,17 @@ index 45f5b0fe25db..94b1bec9ec91 100644
 -
  Library("swap_queue_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-index ddf62c785a8b..38c55315511d 100644
+index 1cafaf0fccd8..a7b739f8a6bd 100644
 --- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -95077,7 +95650,7 @@ index ddf62c785a8b..38c55315511d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95165,7 +95738,7 @@ index ddf62c785a8b..38c55315511d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95191,7 +95764,7 @@ index ddf62c785a8b..38c55315511d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -95233,16 +95806,17 @@ index ddf62c785a8b..38c55315511d 100644
 -
  Library("mutex_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-index 49fefc605d17..837261699c1f 100644
+index 9e64714ec10a..97b3ff17765e 100644
 --- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -95258,7 +95832,7 @@ index 49fefc605d17..837261699c1f 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95346,7 +95920,7 @@ index 49fefc605d17..837261699c1f 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95433,16 +96007,17 @@ index 49fefc605d17..837261699c1f 100644
  
  Library("sequence_checker_internal_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-index a23ba76960b9..7bc90e8a38bc 100644
+index 91d86a5610ba..aa32a8e83779 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -95458,7 +96033,7 @@ index a23ba76960b9..7bc90e8a38bc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95542,7 +96117,7 @@ index a23ba76960b9..7bc90e8a38bc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95629,16 +96204,17 @@ index a23ba76960b9..7bc90e8a38bc 100644
  
  Library("yield_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-index bbfc46863f7e..7a3a8c9d8392 100644
+index 2dc4e624327a..1f8436042e55 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -95654,7 +96230,7 @@ index bbfc46863f7e..7a3a8c9d8392 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95742,7 +96318,7 @@ index bbfc46863f7e..7a3a8c9d8392 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95829,16 +96405,17 @@ index bbfc46863f7e..7a3a8c9d8392 100644
  
  Library("yield_policy_gn")
 diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-index 545f0a4b0e51..aaccd7613890 100644
+index b0e2e5da7e7e..66527897234c 100644
 --- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -95854,7 +96431,7 @@ index 545f0a4b0e51..aaccd7613890 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95938,7 +96515,7 @@ index 545f0a4b0e51..aaccd7613890 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -95964,7 +96541,7 @@ index 545f0a4b0e51..aaccd7613890 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -96007,10 +96584,10 @@ index 545f0a4b0e51..aaccd7613890 100644
  Library("arch_gn")
 diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
 deleted file mode 100644
-index 6941a44d7273..000000000000
+index 2c394aa4f37e..000000000000
 --- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
 +++ /dev/null
-@@ -1,74 +0,0 @@
+@@ -1,75 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -96028,6 +96605,7 @@ index 6941a44d7273..000000000000
 -DEFINES["RTC_ENABLE_VP9"] = True
 -DEFINES["WEBRTC_ARCH_ARM"] = True
 -DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_HAS_NEON"] = True
@@ -96086,16 +96664,17 @@ index 6941a44d7273..000000000000
 -
 -Library("asm_defines_gn")
 diff --git third_party/libwebrtc/rtc_base/system/assume_gn/moz.build third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
-index fdf67e5c09c0..3235c8304687 100644
+index 88793521fdb4..b5a6d2c8d776 100644
 --- third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -96111,7 +96690,7 @@ index fdf67e5c09c0..3235c8304687 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96195,7 +96774,7 @@ index fdf67e5c09c0..3235c8304687 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96221,7 +96800,7 @@ index fdf67e5c09c0..3235c8304687 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -96264,10 +96843,10 @@ index fdf67e5c09c0..3235c8304687 100644
  Library("assume_gn")
 diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
 deleted file mode 100644
-index eb25c5bb304e..000000000000
+index 14ac439a843e..000000000000
 --- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
 +++ /dev/null
-@@ -1,69 +0,0 @@
+@@ -1,70 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -96287,6 +96866,7 @@ index eb25c5bb304e..000000000000
 -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -96338,16 +96918,17 @@ index eb25c5bb304e..000000000000
 -
 -Library("cocoa_threading_gn")
 diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-index 63fa2b96e6b0..10e16e536ab8 100644
+index c254dd7310d1..71cbd6d88473 100644
 --- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -96363,7 +96944,7 @@ index 63fa2b96e6b0..10e16e536ab8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96451,7 +97032,7 @@ index 63fa2b96e6b0..10e16e536ab8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96539,10 +97120,10 @@ index 63fa2b96e6b0..10e16e536ab8 100644
  Library("file_wrapper_gn")
 diff --git third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
 deleted file mode 100644
-index 96aeffe5015f..000000000000
+index 4cd78e0720fb..000000000000
 --- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
 +++ /dev/null
-@@ -1,69 +0,0 @@
+@@ -1,70 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -96562,6 +97143,7 @@ index 96aeffe5015f..000000000000
 -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -96613,16 +97195,17 @@ index 96aeffe5015f..000000000000
 -
 -Library("gcd_helpers_gn")
 diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-index 09e048b3a0a9..9de0ab6e74a2 100644
+index 20ecffc8cd9a..027ac0de7a45 100644
 --- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -96638,7 +97221,7 @@ index 09e048b3a0a9..9de0ab6e74a2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96722,7 +97305,7 @@ index 09e048b3a0a9..9de0ab6e74a2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96748,7 +97331,7 @@ index 09e048b3a0a9..9de0ab6e74a2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -96790,16 +97373,17 @@ index 09e048b3a0a9..9de0ab6e74a2 100644
 -
  Library("ignore_warnings_gn")
 diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-index 8d7e24fe9ae8..353d3dbece53 100644
+index 6de532f77bc4..dd28e6631962 100644
 --- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -96815,7 +97399,7 @@ index 8d7e24fe9ae8..353d3dbece53 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96899,7 +97483,7 @@ index 8d7e24fe9ae8..353d3dbece53 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -96925,7 +97509,7 @@ index 8d7e24fe9ae8..353d3dbece53 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -96967,16 +97551,17 @@ index 8d7e24fe9ae8..353d3dbece53 100644
 -
  Library("inline_gn")
 diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
-index 47f76b807d12..7632cd32cd36 100644
+index 5634579a2a18..6d55bfe1548e 100644
 --- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -96992,7 +97577,7 @@ index 47f76b807d12..7632cd32cd36 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97076,7 +97661,7 @@ index 47f76b807d12..7632cd32cd36 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97102,7 +97687,7 @@ index 47f76b807d12..7632cd32cd36 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97144,16 +97729,17 @@ index 47f76b807d12..7632cd32cd36 100644
 -
  Library("no_unique_address_gn")
 diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-index b5447466b541..80be20f613c2 100644
+index 58380c410f80..0e6a04d1ba36 100644
 --- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -97169,7 +97755,7 @@ index b5447466b541..80be20f613c2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97253,7 +97839,7 @@ index b5447466b541..80be20f613c2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97279,7 +97865,7 @@ index b5447466b541..80be20f613c2 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97321,16 +97907,17 @@ index b5447466b541..80be20f613c2 100644
 -
  Library("rtc_export_gn")
 diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-index 5348c6d421f6..aa077e5ab912 100644
+index cbdf35004712..28e05aca8ec5 100644
 --- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -97346,7 +97933,7 @@ index 5348c6d421f6..aa077e5ab912 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97430,7 +98017,7 @@ index 5348c6d421f6..aa077e5ab912 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97456,7 +98043,7 @@ index 5348c6d421f6..aa077e5ab912 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97498,16 +98085,17 @@ index 5348c6d421f6..aa077e5ab912 100644
 -
  Library("unused_gn")
 diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-index d2bdd0c2e561..851d3877f698 100644
+index c6a4c249445c..e84d1522f3c5 100644
 --- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -97523,7 +98111,7 @@ index d2bdd0c2e561..851d3877f698 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97607,7 +98195,7 @@ index d2bdd0c2e561..851d3877f698 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97633,7 +98221,7 @@ index d2bdd0c2e561..851d3877f698 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -97675,16 +98263,17 @@ index d2bdd0c2e561..851d3877f698 100644
 -
  Library("warn_current_thread_is_deadlocked_gn")
 diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-index 611cef5f0aa9..7ac103b14652 100644
+index 0bf08beda4bc..575e42f95ce9 100644
 --- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -97700,7 +98289,7 @@ index 611cef5f0aa9..7ac103b14652 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97795,7 +98384,7 @@ index 611cef5f0aa9..7ac103b14652 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -97882,16 +98471,17 @@ index 611cef5f0aa9..7ac103b14652 100644
  
  Library("repeating_task_gn")
 diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
-index 4365ae46ca4c..12f8868a8704 100644
+index 625fcbf15e8f..cfdb117a5f98 100644
 --- third_party/libwebrtc/rtc_base/threading_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -97907,7 +98497,7 @@ index 4365ae46ca4c..12f8868a8704 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -49,110 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,110 +59,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98019,7 +98609,7 @@ index 4365ae46ca4c..12f8868a8704 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -160,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -161,82 +67,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98106,19 +98696,20 @@ index 4365ae46ca4c..12f8868a8704 100644
  
  Library("threading_gn")
 diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-index 4b8acb938c23..d445327106b5 100644
+index 1be0df8ed6d3..82f039a138b0 100644
 --- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,6 +13,9 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
+@@ -20,7 +23,13 @@ DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
@@ -98132,7 +98723,7 @@ index 4b8acb938c23..d445327106b5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -48,93 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98227,7 +98818,7 @@ index 4b8acb938c23..d445327106b5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -142,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98314,16 +98905,17 @@ index 4b8acb938c23..d445327106b5 100644
  
  Library("timeutils_gn")
 diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-index 70461b8aa319..2acfd98eda8a 100644
+index 331d12bd262d..369eb994d612 100644
 --- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -98339,7 +98931,7 @@ index 70461b8aa319..2acfd98eda8a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98423,7 +99015,7 @@ index 70461b8aa319..2acfd98eda8a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98449,7 +99041,7 @@ index 70461b8aa319..2acfd98eda8a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -98491,16 +99083,17 @@ index 70461b8aa319..2acfd98eda8a 100644
 -
  Library("type_traits_gn")
 diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-index 65eeebb09ea9..c37beeccab19 100644
+index 85a50db89199..860ae4afad05 100644
 --- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -98516,7 +99109,7 @@ index 65eeebb09ea9..c37beeccab19 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98600,7 +99193,7 @@ index 65eeebb09ea9..c37beeccab19 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98626,7 +99219,7 @@ index 65eeebb09ea9..c37beeccab19 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -98668,16 +99261,17 @@ index 65eeebb09ea9..c37beeccab19 100644
 -
  Library("unique_id_generator_gn")
 diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-index f33182ae409a..6b9bd21729b4 100644
+index b1439e39e1f8..9203eef11023 100644
 --- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -98693,7 +99287,7 @@ index f33182ae409a..6b9bd21729b4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98781,7 +99375,7 @@ index f33182ae409a..6b9bd21729b4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98807,7 +99401,7 @@ index f33182ae409a..6b9bd21729b4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -98849,16 +99443,17 @@ index f33182ae409a..6b9bd21729b4 100644
 -
  Library("unit_base_gn")
 diff --git third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
-index e7b92acff1b1..78fe7e3830bd 100644
+index 885e5c37eaf9..31589a181019 100644
 --- third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -98874,7 +99469,7 @@ index e7b92acff1b1..78fe7e3830bd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98958,7 +99553,7 @@ index e7b92acff1b1..78fe7e3830bd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -98984,7 +99579,7 @@ index e7b92acff1b1..78fe7e3830bd 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -99026,16 +99621,17 @@ index e7b92acff1b1..78fe7e3830bd 100644
 -
  Library("untyped_function_gn")
 diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-index ab5a9a7c184c..ba80c70caacb 100644
+index cde09dbfa662..72eef6a56bf3 100644
 --- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99051,7 +99647,7 @@ index ab5a9a7c184c..ba80c70caacb 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99139,7 +99735,7 @@ index ab5a9a7c184c..ba80c70caacb 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -99227,10 +99823,10 @@ index ab5a9a7c184c..ba80c70caacb 100644
  Library("weak_ptr_gn")
 diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
 deleted file mode 100644
-index 6fefcd32d2ce..000000000000
+index 5f07d1f95c78..000000000000
 --- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
 +++ /dev/null
-@@ -1,91 +0,0 @@
+@@ -1,92 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -99253,6 +99849,7 @@ index 6fefcd32d2ce..000000000000
 -DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99324,10 +99921,10 @@ index 6fefcd32d2ce..000000000000
 -Library("create_direct3d_device_gn")
 diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
 deleted file mode 100644
-index e47a0e579d4a..000000000000
+index 343f70b74fac..000000000000
 --- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
 +++ /dev/null
-@@ -1,91 +0,0 @@
+@@ -1,92 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -99350,6 +99947,7 @@ index e47a0e579d4a..000000000000
 -DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99421,10 +100019,10 @@ index e47a0e579d4a..000000000000
 -Library("get_activation_factory_gn")
 diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
 deleted file mode 100644
-index 348b1af0ac91..000000000000
+index 2c6c4c2b0518..000000000000
 --- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
 +++ /dev/null
-@@ -1,91 +0,0 @@
+@@ -1,92 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -99447,6 +100045,7 @@ index 348b1af0ac91..000000000000
 -DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99518,10 +100117,10 @@ index 348b1af0ac91..000000000000
 -Library("hstring_gn")
 diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
 deleted file mode 100644
-index 0d55a7962fdf..000000000000
+index a890c8616c33..000000000000
 --- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
 +++ /dev/null
-@@ -1,91 +0,0 @@
+@@ -1,92 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -99544,6 +100143,7 @@ index 0d55a7962fdf..000000000000
 -DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99615,10 +100215,10 @@ index 0d55a7962fdf..000000000000
 -Library("windows_version_gn")
 diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
 deleted file mode 100644
-index 449ccd350e31..000000000000
+index 32deba866b8b..000000000000
 --- third_party/libwebrtc/rtc_base/win32_gn/moz.build
 +++ /dev/null
-@@ -1,98 +0,0 @@
+@@ -1,99 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -99641,6 +100241,7 @@ index 449ccd350e31..000000000000
 -DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -DEFINES["UNICODE"] = True
 -DEFINES["USE_AURA"] = "1"
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99718,16 +100319,17 @@ index 449ccd350e31..000000000000
 -
 -Library("win32_gn")
 diff --git third_party/libwebrtc/rtc_base/windowed_min_filter_gn/moz.build third_party/libwebrtc/rtc_base/windowed_min_filter_gn/moz.build
-index d550305318da..7af0bee130e7 100644
+index 604aca8a9920..66c783df0ab1 100644
 --- third_party/libwebrtc/rtc_base/windowed_min_filter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/windowed_min_filter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99743,7 +100345,7 @@ index d550305318da..7af0bee130e7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,86 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99831,7 +100433,7 @@ index d550305318da..7af0bee130e7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -99857,7 +100459,7 @@ index d550305318da..7af0bee130e7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -158,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -99899,16 +100501,17 @@ index d550305318da..7af0bee130e7 100644
 -
  Library("windowed_min_filter_gn")
 diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-index 4255663efd35..50a0a0266df0 100644
+index cc32236f6fd8..ad4975965293 100644
 --- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -99924,7 +100527,7 @@ index 4255663efd35..50a0a0266df0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100012,7 +100615,7 @@ index 4255663efd35..50a0a0266df0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100100,10 +100703,10 @@ index 4255663efd35..50a0a0266df0 100644
  Library("zero_memory_gn")
 diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
 deleted file mode 100644
-index 096fecb4c418..000000000000
+index 3232b94550b1..000000000000
 --- third_party/libwebrtc/sdk/base_objc_gn/moz.build
 +++ /dev/null
-@@ -1,82 +0,0 @@
+@@ -1,83 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100127,6 +100730,7 @@ index 096fecb4c418..000000000000
 -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -100188,10 +100792,10 @@ index 096fecb4c418..000000000000
 -Library("base_objc_gn")
 diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
 deleted file mode 100644
-index 3a84d3e3c208..000000000000
+index dd0e296c0d9b..000000000000
 --- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
 +++ /dev/null
-@@ -1,77 +0,0 @@
+@@ -1,78 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100215,6 +100819,7 @@ index 3a84d3e3c208..000000000000
 -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -100271,10 +100876,10 @@ index 3a84d3e3c208..000000000000
 -Library("helpers_objc_gn")
 diff --git third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
 deleted file mode 100644
-index fa087172c452..000000000000
+index 2ffeeaa138b8..000000000000
 --- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
 +++ /dev/null
-@@ -1,72 +0,0 @@
+@@ -1,73 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100294,6 +100899,7 @@ index fa087172c452..000000000000
 -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -100349,10 +100955,10 @@ index fa087172c452..000000000000
 -Library("videocapture_objc_gn")
 diff --git third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
 deleted file mode 100644
-index 64809b92e3e7..000000000000
+index aa7cfdc37e7e..000000000000
 --- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
 +++ /dev/null
-@@ -1,75 +0,0 @@
+@@ -1,76 +0,0 @@
 -# This Source Code Form is subject to the terms of the Mozilla Public
 -# License, v. 2.0. If a copy of the MPL was not distributed with this
 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100372,6 +100978,7 @@ index 64809b92e3e7..000000000000
 -DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
 -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 -DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
 -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 -DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
 -DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -100429,16 +101036,17 @@ index 64809b92e3e7..000000000000
 -
 -Library("videoframebuffer_objc_gn")
 diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-index 3e1292f36a2a..a9b4f9f9fd1e 100644
+index 08d9aa144732..fd8ec68ddd26 100644
 --- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -100454,7 +101062,7 @@ index 3e1292f36a2a..a9b4f9f9fd1e 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100542,7 +101150,7 @@ index 3e1292f36a2a..a9b4f9f9fd1e 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100629,16 +101237,17 @@ index 3e1292f36a2a..a9b4f9f9fd1e 100644
  
  Library("metrics_gn")
 diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-index 46a6c47b9195..e4744c0609ef 100644
+index 4fa60596e37a..baedab7a92c5 100644
 --- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -100654,7 +101263,7 @@ index 46a6c47b9195..e4744c0609ef 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100749,7 +101358,7 @@ index 46a6c47b9195..e4744c0609ef 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100836,16 +101445,17 @@ index 46a6c47b9195..e4744c0609ef 100644
  
  Library("system_wrappers_gn")
 diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-index 2e86a77b581e..9eae6e64d62d 100644
+index 397490a28b3e..d4884aaa78de 100644
 --- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 +++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -100861,7 +101471,7 @@ index 2e86a77b581e..9eae6e64d62d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,94 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100957,7 +101567,7 @@ index 2e86a77b581e..9eae6e64d62d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -138,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -100983,7 +101593,7 @@ index 2e86a77b581e..9eae6e64d62d 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -101077,18 +101687,25 @@ index b7d9cb6142bd..000000000000
 -    DEFINES["__ARM_NEON__"] = "1"
 -
 -Library("ndk_compat_gn")
-diff --git third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
-index a0d1e7a84956..6b30b605cef1 100644
---- third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
-+++ third_party/libwebrtc/third_party/crc32c/crc32c_arm64_gn/moz.build
-@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
- DEFINES["HAVE_ARM64_CRC32C"] = "0"
- DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
- DEFINES["HAVE_SSE42"] = "0"
-+DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
-+DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
+diff --git third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
+index 8091b9ad80dc..24ab243a5f63 100644
+--- third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
++++ third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
@@ -101097,7 +101714,7 @@ index a0d1e7a84956..6b30b605cef1 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,107 +51,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,82 +54,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101106,9 +101723,11 @@ index a0d1e7a84956..6b30b605cef1 100644
 -
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "1"
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101116,19 +101735,19 @@ index a0d1e7a84956..6b30b605cef1 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "1"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "1"
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -101137,10 +101756,10 @@ index a0d1e7a84956..6b30b605cef1 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -101150,13 +101769,13 @@ index a0d1e7a84956..6b30b605cef1 100644
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
 -    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -    DEFINES["UNICODE"] = True
 -    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
 -    DEFINES["WIN32"] = True
 -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
 -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
@@ -101165,6 +101784,7 @@ index a0d1e7a84956..6b30b605cef1 100644
 -    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
 -    DEFINES["_CRT_RAND_S"] = True
 -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -    DEFINES["_HAS_EXCEPTIONS"] = "0"
 -    DEFINES["_HAS_NODISCARD"] = True
 -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
@@ -101178,44 +101798,36 @@ index a0d1e7a84956..6b30b605cef1 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
+@@ -128,25 +62,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
 -
--    DEFINES["HAVE_MM_PREFETCH"] = "0"
+-if CONFIG["TARGET_CPU"] == "loongarch64":
 -
- if CONFIG["TARGET_CPU"] == "loongarch64":
- 
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
 -    DEFINES["_GNU_SOURCE"] = True
- 
+-
  if CONFIG["TARGET_CPU"] == "mips32":
  
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "mips64":
- 
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
 -    DEFINES["_GNU_SOURCE"] = True
  
- if CONFIG["TARGET_CPU"] == "ppc64":
+ if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -154,56 +80,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
+@@ -156,40 +75,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
- if CONFIG["TARGET_CPU"] == "x86":
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
--    DEFINES["HAVE_MM_PREFETCH"] = "1"
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["HAVE_MM_PREFETCH"] = "1"
--
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -101236,12 +101848,6 @@ index a0d1e7a84956..6b30b605cef1 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -101252,32 +101858,32 @@ index a0d1e7a84956..6b30b605cef1 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["HAVE_MM_PREFETCH"] = "1"
- 
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
+-
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["HAVE_MM_PREFETCH"] = "1"
- 
- Library("crc32c_arm64_gn")
-diff --git third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
-index 31ce063d9097..a7185ebcf11d 100644
---- third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
-+++ third_party/libwebrtc/third_party/crc32c/crc32c_gn/moz.build
-@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
- DEFINES["HAVE_ARM64_CRC32C"] = "0"
- DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
- DEFINES["HAVE_SSE42"] = "0"
-+DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
-+DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
+-
+ Library("dav1d_gn")
+diff --git third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
+index 9cc4e1525173..8d21c4ce3e54 100644
+--- third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
++++ third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
@@ -101286,7 +101892,7 @@ index 31ce063d9097..a7185ebcf11d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,107 +52,24 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,82 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101295,9 +101901,11 @@ index 31ce063d9097..a7185ebcf11d 100644
 -
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "1"
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -101305,19 +101913,19 @@ index 31ce063d9097..a7185ebcf11d 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux":
 -
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "1"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "1"
 -    DEFINES["USE_AURA"] = "1"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -101326,10 +101934,10 @@ index 31ce063d9097..a7185ebcf11d 100644
 -
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -101339,13 +101947,13 @@ index 31ce063d9097..a7185ebcf11d 100644
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
 -    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -    DEFINES["UNICODE"] = True
 -    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
 -    DEFINES["WIN32"] = True
 -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
 -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
@@ -101354,6 +101962,7 @@ index 31ce063d9097..a7185ebcf11d 100644
 -    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
 -    DEFINES["_CRT_RAND_S"] = True
 -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -    DEFINES["_HAS_EXCEPTIONS"] = "0"
 -    DEFINES["_HAS_NODISCARD"] = True
 -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
@@ -101367,198 +101976,36 @@ index 31ce063d9097..a7185ebcf11d 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
+@@ -126,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
 -
--    DEFINES["HAVE_MM_PREFETCH"] = "0"
+-if CONFIG["TARGET_CPU"] == "loongarch64":
 -
- if CONFIG["TARGET_CPU"] == "loongarch64":
- 
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
 -    DEFINES["_GNU_SOURCE"] = True
- 
+-
  if CONFIG["TARGET_CPU"] == "mips32":
  
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "mips64":
- 
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "ppc64":
- 
-@@ -155,56 +81,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
--    DEFINES["HAVE_MM_PREFETCH"] = "1"
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["HAVE_MM_PREFETCH"] = "1"
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-if CONFIG["TARGET_CPU"] == "mips64":
 -
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["HAVE_MM_PREFETCH"] = "1"
  
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["HAVE_MM_PREFETCH"] = "1"
- 
- Library("crc32c_gn")
-diff --git third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
-index 35330ec53ea7..0ab76c5c37a9 100644
---- third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
-+++ third_party/libwebrtc/third_party/crc32c/crc32c_internal_headers_gn/moz.build
-@@ -9,6 +9,14 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
-+
- FINAL_LIBRARY = "xul"
- 
- 
-@@ -30,120 +38,10 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
--    DEFINES["__STD_C"] = True
-+    DEFINES["_DEBUG"] = True
+ if CONFIG["TARGET_CPU"] == "x86":
  
- if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -154,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
-     DEFINES["__ARM_NEON__"] = "1"
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips32":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -101595,207 +102042,59 @@ index 35330ec53ea7..0ab76c5c37a9 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("crc32c_internal_headers_gn")
-diff --git third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
-index b166c70f47e2..dd67af212e47 100644
---- third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
-+++ third_party/libwebrtc/third_party/crc32c/crc32c_sse42_gn/moz.build
-@@ -14,6 +14,15 @@ DEFINES["CRC32C_TESTS_BUILT_WITH_GLOG"] = "0"
- DEFINES["HAVE_ARM64_CRC32C"] = "0"
- DEFINES["HAVE_BUILTIN_PREFETCH"] = "1"
- DEFINES["HAVE_SSE42"] = "0"
-+DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
-+DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "xul"
- 
-@@ -42,107 +51,24 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "1"
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "1"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "1"
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["HAVE_STRONG_GETAUXVAL"] = "0"
--    DEFINES["HAVE_WEAK_GETAUXVAL"] = "0"
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
--    DEFINES["__STD_C"] = True
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
+ Library("aom_gn")
+diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
+index 3b7a1023acf2..776039fcfc65 100644
+--- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
++++ third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
+@@ -13,21 +13,18 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["USE_AURA"] = "1"
+ DEFINES["USE_GLIB"] = "1"
+ DEFINES["USE_OZONE"] = "1"
+-DEFINES["USE_UDEV"] = True
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+ DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+ DEFINES["_FILE_OFFSET_BITS"] = "64"
+-DEFINES["_GNU_SOURCE"] = True
+ DEFINES["_LARGEFILE64_SOURCE"] = True
+ DEFINES["_LARGEFILE_SOURCE"] = True
+ DEFINES["__STDC_CONSTANT_MACROS"] = True
+@@ -65,12 +62,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
--    DEFINES["HAVE_MM_PREFETCH"] = "0"
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
 -
- if CONFIG["TARGET_CPU"] == "loongarch64":
- 
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
--    DEFINES["_GNU_SOURCE"] = True
- 
  if CONFIG["TARGET_CPU"] == "mips32":
  
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "mips64":
- 
-     DEFINES["HAVE_MM_PREFETCH"] = "0"
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "ppc64":
- 
-@@ -154,56 +80,14 @@ if CONFIG["TARGET_CPU"] == "riscv64":
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
--    DEFINES["HAVE_MM_PREFETCH"] = "1"
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["HAVE_MM_PREFETCH"] = "1"
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["HAVE_MM_PREFETCH"] = "1"
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["HAVE_MM_PREFETCH"] = "1"
- 
- Library("crc32c_sse42_gn")
-diff --git third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
-index 535f30143955..9b3a8baecfa4 100644
---- third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
-+++ third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+     DEFINES["MIPS32_LE"] = True
+diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+index 697e9582504d..262439b9ac01 100644
+--- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
++++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -101811,7 +102110,7 @@ index 535f30143955..9b3a8baecfa4 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -44,82 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,82 +54,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101895,7 +102194,7 @@ index 535f30143955..9b3a8baecfa4 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -127,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -128,25 +62,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -101921,7 +102220,7 @@ index 535f30143955..9b3a8baecfa4 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -155,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -156,40 +75,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -101961,34 +102260,27 @@ index 535f30143955..9b3a8baecfa4 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("dav1d_gn")
-diff --git third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
-index 12c3f72b5b06..f4cc587c8a36 100644
---- third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
-+++ third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
+ Library("yuv_gn")
+diff --git third_party/libwebrtc/third_party/opus/opus_gn/moz.build third_party/libwebrtc/third_party/opus/opus_gn/moz.build
+index bfeaa56b05af..d8e71c4280d9 100644
+--- third_party/libwebrtc/third_party/opus/opus_gn/moz.build
++++ third_party/libwebrtc/third_party/opus/opus_gn/moz.build
+@@ -9,6 +9,14 @@
+ COMPILE_FLAGS["OS_INCLUDES"] = []
+ AllowCompilerWarnings()
+ 
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
- 
++
  FINAL_LIBRARY = "xul"
  
-@@ -42,82 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ 
+@@ -30,120 +38,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101998,10 +102290,6 @@ index 12c3f72b5b06..f4cc587c8a36 100644
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102009,8 +102297,6 @@ index 12c3f72b5b06..f4cc587c8a36 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -102020,8 +102306,6 @@ index 12c3f72b5b06..f4cc587c8a36 100644
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102032,8 +102316,6 @@ index 12c3f72b5b06..f4cc587c8a36 100644
 -
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102046,10 +102328,8 @@ index 12c3f72b5b06..f4cc587c8a36 100644
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
 -    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -    DEFINES["UNICODE"] = True
 -    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
 -    DEFINES["WIN32"] = True
 -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
 -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
@@ -102058,7 +102338,6 @@ index 12c3f72b5b06..f4cc587c8a36 100644
 -    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
 -    DEFINES["_CRT_RAND_S"] = True
 -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -    DEFINES["_HAS_EXCEPTIONS"] = "0"
 -    DEFINES["_HAS_NODISCARD"] = True
 -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
@@ -102072,36 +102351,20 @@ index 12c3f72b5b06..f4cc587c8a36 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
--if CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
 -if CONFIG["TARGET_CPU"] == "loongarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
+-if CONFIG["TARGET_CPU"] == "mips32":
+-
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["TARGET_CPU"] == "mips64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
-@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -102138,73 +102401,27 @@ index 12c3f72b5b06..f4cc587c8a36 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("aom_gn")
-diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-index e2c9ea11a576..2a72b5041e77 100644
---- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-+++ third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-@@ -13,20 +13,17 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
--DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
--DEFINES["USE_UDEV"] = True
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
--DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
- DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
-@@ -64,12 +61,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["WEBRTC_HAS_NEON"] = True
-     DEFINES["__ARM_NEON__"] = "1"
- 
--if CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
+ Library("opus_gn")
+diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
+index fa6a7850dc2f..328baf0e1eac 100644
+--- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
++++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
+@@ -9,6 +9,14 @@
+ COMPILE_FLAGS["OS_INCLUDES"] = []
+ AllowCompilerWarnings()
  
-     DEFINES["MIPS32_LE"] = True
-diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-index d4cfc3821ac8..defbc3e51a23 100644
---- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-+++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
- 
++
  FINAL_LIBRARY = "xul"
  
-@@ -44,82 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+ 
+@@ -34,95 +42,23 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102214,10 +102431,6 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -102225,8 +102438,6 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -102236,8 +102447,6 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102248,8 +102457,6 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102262,10 +102469,8 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
 -    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -    DEFINES["UNICODE"] = True
 -    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
 -    DEFINES["WIN32"] = True
 -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
 -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
@@ -102274,12 +102479,12 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
 -    DEFINES["_CRT_RAND_S"] = True
 -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -    DEFINES["_HAS_EXCEPTIONS"] = "0"
 -    DEFINES["_HAS_NODISCARD"] = True
 -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 -    DEFINES["_SECURE_ATL"] = True
 -    DEFINES["_UNICODE"] = True
+-    DEFINES["_USE_MATH_DEFINES"] = True
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
@@ -102288,35 +102493,34 @@ index d4cfc3821ac8..defbc3e51a23 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -127,25 +61,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
-     DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
+-    CFLAGS += [
+-        "-mfpu=neon"
+-    ]
 -
+ if CONFIG["TARGET_CPU"] == "loongarch64":
+ 
+     DEFINES["PFFFT_SIMD_DISABLE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
+ 
  if CONFIG["TARGET_CPU"] == "mips32":
  
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
+     DEFINES["PFFFT_SIMD_DISABLE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
+ 
+ if CONFIG["TARGET_CPU"] == "mips64":
+ 
+     DEFINES["PFFFT_SIMD_DISABLE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
  
- if CONFIG["TARGET_CPU"] == "x86":
+ if CONFIG["TARGET_CPU"] == "ppc64":
  
-@@ -155,40 +74,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -132,50 +68,10 @@ if CONFIG["TARGET_CPU"] == "riscv64":
  
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+     DEFINES["PFFFT_SIMD_DISABLE"] = True
  
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
@@ -102338,6 +102542,12 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    CFLAGS += [
+-        "-msse2"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -102347,18 +102557,23 @@ index d4cfc3821ac8..defbc3e51a23 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
++if CONFIG["TARGET_CPU"] == "x86":
+ 
+     CFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("yuv_gn")
-diff --git third_party/libwebrtc/third_party/opus/opus_gn/moz.build third_party/libwebrtc/third_party/opus/opus_gn/moz.build
-index bfeaa56b05af..d8e71c4280d9 100644
---- third_party/libwebrtc/third_party/opus/opus_gn/moz.build
-+++ third_party/libwebrtc/third_party/opus/opus_gn/moz.build
+ Library("pffft_gn")
+diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
+index 11dbf4942190..d44acce8cafa 100644
+--- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
++++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
 @@ -9,6 +9,14 @@
  COMPILE_FLAGS["OS_INCLUDES"] = []
  AllowCompilerWarnings()
@@ -102374,7 +102589,7 @@ index bfeaa56b05af..d8e71c4280d9 100644
  FINAL_LIBRARY = "xul"
  
  
-@@ -30,120 +38,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -34,136 +42,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102447,6 +102662,12 @@ index bfeaa56b05af..d8e71c4280d9 100644
  
      DEFINES["__ARM_NEON__"] = "1"
  
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -if CONFIG["TARGET_CPU"] == "loongarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -102479,6 +102700,13 @@ index bfeaa56b05af..d8e71c4280d9 100644
 -
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
++if CONFIG["TARGET_CPU"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -102489,33 +102717,45 @@ index bfeaa56b05af..d8e71c4280d9 100644
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
 -
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("opus_gn")
-diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-index fa6a7850dc2f..328baf0e1eac 100644
---- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-+++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-@@ -9,6 +9,14 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
+ Library("rnn_vad_gn")
+diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
+index 71500f1d9ccc..4b1785d01c7b 100644
+--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
++++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
-+
- FINAL_LIBRARY = "xul"
  
+ FINAL_LIBRARY = "xul"
  
-@@ -34,95 +42,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -58,94 +67,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102525,13 +102765,24 @@ index fa6a7850dc2f..328baf0e1eac 100644
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "GLESv2",
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -102541,6 +102792,8 @@ index fa6a7850dc2f..328baf0e1eac 100644
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102551,6 +102804,8 @@ index fa6a7850dc2f..328baf0e1eac 100644
 -
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102563,8 +102818,10 @@ index fa6a7850dc2f..328baf0e1eac 100644
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
 -    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -    DEFINES["UNICODE"] = True
 -    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
 -    DEFINES["WIN32"] = True
 -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
 -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
@@ -102573,49 +102830,63 @@ index fa6a7850dc2f..328baf0e1eac 100644
 -    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
 -    DEFINES["_CRT_RAND_S"] = True
 -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -    DEFINES["_HAS_EXCEPTIONS"] = "0"
 -    DEFINES["_HAS_NODISCARD"] = True
 -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 -    DEFINES["_SECURE_ATL"] = True
 -    DEFINES["_UNICODE"] = True
--    DEFINES["_USE_MATH_DEFINES"] = True
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
+@@ -153,82 +75,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CFLAGS += [
+-    CXXFLAGS += [
 -        "-mfpu=neon"
 -    ]
 -
- if CONFIG["TARGET_CPU"] == "loongarch64":
- 
-     DEFINES["PFFFT_SIMD_DISABLE"] = True
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
 -    DEFINES["_GNU_SOURCE"] = True
- 
+-
  if CONFIG["TARGET_CPU"] == "mips32":
  
-     DEFINES["PFFFT_SIMD_DISABLE"] = True
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "mips64":
- 
-     DEFINES["PFFFT_SIMD_DISABLE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
 -    DEFINES["_GNU_SOURCE"] = True
  
- if CONFIG["TARGET_CPU"] == "ppc64":
- 
-@@ -132,50 +68,10 @@ if CONFIG["TARGET_CPU"] == "riscv64":
- 
-     DEFINES["PFFFT_SIMD_DISABLE"] = True
+ if CONFIG["TARGET_CPU"] == "x86":
  
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -102638,10 +102909,10 @@ index fa6a7850dc2f..328baf0e1eac 100644
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
 -
--    CFLAGS += [
--        "-msse2"
--    ]
--
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -102651,39 +102922,49 @@ index fa6a7850dc2f..328baf0e1eac 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
- 
-     CFLAGS += [
-         "-msse2"
-     ]
- 
--    DEFINES["_GNU_SOURCE"] = True
 -
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
 -
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("pffft_gn")
-diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-index 11dbf4942190..d44acce8cafa 100644
---- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-+++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-@@ -9,6 +9,14 @@
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["TARGET_CPU"] == "x86_64":
  
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("video_adaptation_gn")
+diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+index b061e235ad37..6bd8969064f2 100644
+--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
++++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
 +DEFINES["_FILE_OFFSET_BITS"] = "64"
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
-+
- FINAL_LIBRARY = "xul"
  
+ FINAL_LIBRARY = "xul"
  
-@@ -34,136 +42,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102693,13 +102974,23 @@ index 11dbf4942190..d44acce8cafa 100644
 -    DEFINES["ANDROID"] = True
 -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
 -    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -    DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
@@ -102709,6 +103000,8 @@ index 11dbf4942190..d44acce8cafa 100644
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
 -    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102719,6 +103012,8 @@ index 11dbf4942190..d44acce8cafa 100644
 -
 -    DEFINES["USE_GLIB"] = "1"
 -    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
 -    DEFINES["_FILE_OFFSET_BITS"] = "64"
 -    DEFINES["_LARGEFILE64_SOURCE"] = True
 -    DEFINES["_LARGEFILE_SOURCE"] = True
@@ -102731,8 +103026,10 @@ index 11dbf4942190..d44acce8cafa 100644
 -    DEFINES["NOMINMAX"] = True
 -    DEFINES["NTDDI_VERSION"] = "0x0A000000"
 -    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
 -    DEFINES["UNICODE"] = True
 -    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
 -    DEFINES["WIN32"] = True
 -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
 -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
@@ -102741,6 +103038,7 @@ index 11dbf4942190..d44acce8cafa 100644
 -    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
 -    DEFINES["_CRT_RAND_S"] = True
 -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
 -    DEFINES["_HAS_EXCEPTIONS"] = "0"
 -    DEFINES["_HAS_NODISCARD"] = True
 -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
@@ -102750,10 +103048,19 @@ index 11dbf4942190..d44acce8cafa 100644
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
 -if CONFIG["TARGET_CPU"] == "arm":
@@ -102762,17 +103069,31 @@ index 11dbf4942190..d44acce8cafa 100644
 -        "-mfpu=neon"
 -    ]
 -
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
 -if CONFIG["TARGET_CPU"] == "loongarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
--if CONFIG["TARGET_CPU"] == "mips32":
--
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["TARGET_CPU"] == "mips64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
@@ -102795,8 +103116,7 @@ index 11dbf4942190..d44acce8cafa 100644
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["TARGET_CPU"] == "x86":
- 
+-
      CXXFLAGS += [
          "-msse2"
      ]
@@ -102816,23 +103136,27 @@ index 11dbf4942190..d44acce8cafa 100644
 -    ]
 -
 -    DEFINES["_GNU_SOURCE"] = True
--
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("rnn_vad_gn")
-diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-index e89108dfcf2c..cce3074b8cb0 100644
---- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+ Library("encoder_config_gn")
+diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
+index 9c9537e37618..5c4bae1982f8 100644
+--- third_party/libwebrtc/video/config/streams_config_gn/moz.build
++++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -102848,7 +103172,7 @@ index e89108dfcf2c..cce3074b8cb0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -57,94 +66,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,94 +57,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102944,7 +103268,7 @@ index e89108dfcf2c..cce3074b8cb0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -152,82 +74,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -143,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103029,18 +103353,19 @@ index e89108dfcf2c..cce3074b8cb0 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("video_adaptation_gn")
-diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-index 74145a92544d..22716e70e484 100644
---- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-+++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("streams_config_gn")
+diff --git third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
+index cfa160ce62f1..359336a22dc2 100644
+--- third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
++++ third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -103056,7 +103381,7 @@ index 74145a92544d..22716e70e484 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103151,7 +103476,7 @@ index 74145a92544d..22716e70e484 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103236,18 +103561,19 @@ index 74145a92544d..22716e70e484 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("encoder_config_gn")
-diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
-index 8bce9bd5ba2a..e266ecab0cd5 100644
---- third_party/libwebrtc/video/config/streams_config_gn/moz.build
-+++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("corruption_classifier_gn")
+diff --git third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_impl_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_impl_gn/moz.build
+index 0bb956b8c152..29219c0a2b68 100644
+--- third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_impl_gn/moz.build
++++ third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_impl_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -103444,18 +103770,19 @@ index 8bce9bd5ba2a..e266ecab0cd5 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("streams_config_gn")
-diff --git third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-index 5a77553e544c..0a93ce3fe690 100644
---- third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-+++ third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("frame_instrumentation_generator_impl_gn")
+diff --git third_party/libwebrtc/video/corruption_detection/frame_selector_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_selector_gn/moz.build
+index c1eb4687a455..d52a74511c4a 100644
+--- third_party/libwebrtc/video/corruption_detection/frame_selector_gn/moz.build
++++ third_party/libwebrtc/video/corruption_detection/frame_selector_gn/moz.build
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -103471,7 +103798,7 @@ index 5a77553e544c..0a93ce3fe690 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103566,7 +103893,7 @@ index 5a77553e544c..0a93ce3fe690 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103651,18 +103978,19 @@ index 5a77553e544c..0a93ce3fe690 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
- Library("corruption_classifier_gn")
+ Library("frame_selector_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-index 35e4e34af56e..6e62859f71aa 100644
+index ea5e36bc12b2..5711161052a2 100644
 --- third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -103678,7 +104006,7 @@ index 35e4e34af56e..6e62859f71aa 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103773,7 +104101,7 @@ index 35e4e34af56e..6e62859f71aa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -103860,16 +104188,17 @@ index 35e4e34af56e..6e62859f71aa 100644
  
  Library("generic_mapping_functions_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-index 37c645c71910..01010a22e813 100644
+index 4d828ba340ab..8863de6699e2 100644
 --- third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -103885,7 +104214,7 @@ index 37c645c71910..01010a22e813 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103980,7 +104309,7 @@ index 37c645c71910..01010a22e813 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -104067,16 +104396,17 @@ index 37c645c71910..01010a22e813 100644
  
  Library("halton_frame_sampler_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-index 1c216e73bcbc..bd61c3dcb4fe 100644
+index 5a7861935409..dd527cc598fd 100644
 --- third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -104092,7 +104422,7 @@ index 1c216e73bcbc..bd61c3dcb4fe 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -104180,7 +104510,7 @@ index 1c216e73bcbc..bd61c3dcb4fe 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -104267,16 +104597,17 @@ index 1c216e73bcbc..bd61c3dcb4fe 100644
  
  Library("halton_sequence_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/utils_gn/moz.build third_party/libwebrtc/video/corruption_detection/utils_gn/moz.build
-index 0cd195cd2b25..419fa1ca8dfa 100644
+index bfcf6943e7fd..9a413a84c00c 100644
 --- third_party/libwebrtc/video/corruption_detection/utils_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/utils_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -104292,7 +104623,7 @@ index 0cd195cd2b25..419fa1ca8dfa 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -104387,7 +104718,7 @@ index 0cd195cd2b25..419fa1ca8dfa 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -104474,16 +104805,17 @@ index 0cd195cd2b25..419fa1ca8dfa 100644
  
  Library("utils_gn")
 diff --git third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
-index 6c81ca519e96..53a0aecf15a7 100644
+index 9a1b15abcfff..1982add086b5 100644
 --- third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
 +++ third_party/libwebrtc/video/corruption_detection/video_frame_sampler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -104499,7 +104831,7 @@ index 6c81ca519e96..53a0aecf15a7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -104594,7 +104926,7 @@ index 6c81ca519e96..53a0aecf15a7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -104681,16 +105013,17 @@ index 6c81ca519e96..53a0aecf15a7 100644
  
  Library("video_frame_sampler_gn")
 diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-index 8d00bc66d4d7..37dd43f219d7 100644
+index 8f7ab83f0410..6cca8e356eab 100644
 --- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
 +++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -104706,7 +105039,7 @@ index 8d00bc66d4d7..37dd43f219d7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -104801,7 +105134,7 @@ index 8d00bc66d4d7..37dd43f219d7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -104888,16 +105221,17 @@ index 8d00bc66d4d7..37dd43f219d7 100644
  
  Library("decode_synchronizer_gn")
 diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-index 0764c59c2ae1..76d308fbc122 100644
+index 7154de522f9f..8217072a1ae6 100644
 --- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
 +++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -104913,7 +105247,7 @@ index 0764c59c2ae1..76d308fbc122 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105008,7 +105342,7 @@ index 0764c59c2ae1..76d308fbc122 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105095,16 +105429,17 @@ index 0764c59c2ae1..76d308fbc122 100644
  
  Library("frame_cadence_adapter_gn")
 diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
-index ebfa0cf8e98b..083623da19ed 100644
+index 31aaa0c6d9f7..19ae483f4a71 100644
 --- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
 +++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -105120,7 +105455,7 @@ index ebfa0cf8e98b..083623da19ed 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105215,7 +105550,7 @@ index ebfa0cf8e98b..083623da19ed 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105241,7 +105576,7 @@ index ebfa0cf8e98b..083623da19ed 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -105283,16 +105618,17 @@ index ebfa0cf8e98b..083623da19ed 100644
 -
  Library("frame_decode_scheduler_gn")
 diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-index dff6817185a6..a6391ed1d6d9 100644
+index c7f2119841bf..137f7895b759 100644
 --- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
 +++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -105308,7 +105644,7 @@ index dff6817185a6..a6391ed1d6d9 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105403,7 +105739,7 @@ index dff6817185a6..a6391ed1d6d9 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105490,16 +105826,17 @@ index dff6817185a6..a6391ed1d6d9 100644
  
  Library("frame_decode_timing_gn")
 diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-index 227df191f979..60e92d4b43b8 100644
+index b6b7ffe4bf11..32555ded59e3 100644
 --- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -105515,7 +105852,7 @@ index 227df191f979..60e92d4b43b8 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105611,7 +105948,7 @@ index 227df191f979..60e92d4b43b8 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105698,16 +106035,17 @@ index 227df191f979..60e92d4b43b8 100644
  
  Library("frame_dumping_decoder_gn")
 diff --git third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-index 8d0c58f78dc2..e80fc74c8dfc 100644
+index 911201c95b45..14caad01936c 100644
 --- third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -105723,7 +106061,7 @@ index 8d0c58f78dc2..e80fc74c8dfc 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105819,7 +106157,7 @@ index 8d0c58f78dc2..e80fc74c8dfc 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -105906,16 +106244,17 @@ index 8d0c58f78dc2..e80fc74c8dfc 100644
  
  Library("frame_dumping_encoder_gn")
 diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-index 4635e7a8e62f..0611183c55ca 100644
+index a77229b1cd27..a692101c0f9a 100644
 --- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
 +++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -105931,7 +106270,7 @@ index 4635e7a8e62f..0611183c55ca 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106026,7 +106365,7 @@ index 4635e7a8e62f..0611183c55ca 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -106113,16 +106452,17 @@ index 4635e7a8e62f..0611183c55ca 100644
  
  Library("incoming_video_stream_gn")
 diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-index d0063c8e73d3..a4d236fc549c 100644
+index 95c5cfac3135..5115768187f8 100644
 --- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
 +++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -106138,7 +106478,7 @@ index d0063c8e73d3..a4d236fc549c 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106233,7 +106573,7 @@ index d0063c8e73d3..a4d236fc549c 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -106320,16 +106660,17 @@ index d0063c8e73d3..a4d236fc549c 100644
  
  Library("video_render_frames_gn")
 diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-index ab2e1394bc6f..17b977e8823b 100644
+index 4de1f5ad2fdd..8246738516f0 100644
 --- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
 +++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -106345,7 +106686,7 @@ index ab2e1394bc6f..17b977e8823b 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106440,7 +106781,7 @@ index ab2e1394bc6f..17b977e8823b 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -106527,16 +106868,17 @@ index ab2e1394bc6f..17b977e8823b 100644
  
  Library("task_queue_frame_decode_scheduler_gn")
 diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-index a18e7c809be4..15326cffbbdd 100644
+index 72e688a2fd38..81a67ad64a30 100644
 --- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
 +++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -106552,7 +106894,7 @@ index a18e7c809be4..15326cffbbdd 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,82 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,82 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106636,7 +106978,7 @@ index a18e7c809be4..15326cffbbdd 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -129,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -130,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -106723,16 +107065,17 @@ index a18e7c809be4..15326cffbbdd 100644
  
  Library("unique_timestamp_counter_gn")
 diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
-index bf9570a50f61..852d85724b5a 100644
+index 1ed93bc4edad..e89aa9c1a879 100644
 --- third_party/libwebrtc/video/video_gn/moz.build
 +++ third_party/libwebrtc/video/video_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -106748,7 +107091,7 @@ index bf9570a50f61..852d85724b5a 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -65,94 +74,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -66,94 +75,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106844,7 +107187,7 @@ index bf9570a50f61..852d85724b5a 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -160,82 +82,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -161,82 +83,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -106931,16 +107274,17 @@ index bf9570a50f61..852d85724b5a 100644
  
  Library("video_gn")
 diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-index 5b7cfa965acb..870f098f8f00 100644
+index 42870825480d..be7dadbb91b3 100644
 --- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
 +++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -106956,7 +107300,7 @@ index 5b7cfa965acb..870f098f8f00 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107051,7 +107395,7 @@ index 5b7cfa965acb..870f098f8f00 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107138,16 +107482,17 @@ index 5b7cfa965acb..870f098f8f00 100644
  
  Library("video_receive_stream_timeout_tracker_gn")
 diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-index 546b31db87d2..c8a455a621d5 100644
+index 606194de9fc4..0e08359b11ae 100644
 --- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -107163,7 +107508,7 @@ index 546b31db87d2..c8a455a621d5 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107259,7 +107604,7 @@ index 546b31db87d2..c8a455a621d5 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107346,16 +107691,17 @@ index 546b31db87d2..c8a455a621d5 100644
  
  Library("video_stream_buffer_controller_gn")
 diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-index 361043fbfbf9..ef4b2d0642b2 100644
+index b0d640ccd28d..be6404ae0ef6 100644
 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -107371,7 +107717,7 @@ index 361043fbfbf9..ef4b2d0642b2 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -54,94 +63,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,94 +64,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107467,7 +107813,7 @@ index 361043fbfbf9..ef4b2d0642b2 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -149,82 +71,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -150,82 +72,21 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107554,16 +107900,17 @@ index 361043fbfbf9..ef4b2d0642b2 100644
  
  Library("video_stream_encoder_impl_gn")
 diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
-index 2fde9b415646..e25edf163bd7 100644
+index 4cfd356d5a35..60a6dad7b102 100644
 --- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -107579,7 +107926,7 @@ index 2fde9b415646..e25edf163bd7 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,93 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107674,7 +108021,7 @@ index 2fde9b415646..e25edf163bd7 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -137,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107700,7 +108047,7 @@ index 2fde9b415646..e25edf163bd7 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -165,40 +73,4 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -107742,16 +108089,17 @@ index 2fde9b415646..e25edf163bd7 100644
 -
  Library("video_stream_encoder_interface_gn")
 diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index ba124401bf6a..1340bec6cba0 100644
+index 4c4f3e51bc4e..098548836fda 100644
 --- third_party/libwebrtc/webrtc_gn/moz.build
 +++ third_party/libwebrtc/webrtc_gn/moz.build
-@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
  DEFINES["RTC_ENABLE_VP9"] = True
 +DEFINES["USE_GLIB"] = "1"
 +DEFINES["USE_OZONE"] = "1"
 +DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_DEPRECATE_PLAN_B"] = True
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
@@ -107767,7 +108115,7 @@ index ba124401bf6a..1340bec6cba0 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -42,117 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,117 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107886,7 +108234,7 @@ index ba124401bf6a..1340bec6cba0 100644
  
  if CONFIG["TARGET_CPU"] == "aarch64":
  
-@@ -160,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -161,25 +60,10 @@ if CONFIG["TARGET_CPU"] == "aarch64":
      DEFINES["WEBRTC_HAS_NEON"] = True
      DEFINES["__ARM_NEON__"] = "1"
  
@@ -107912,7 +108260,7 @@ index ba124401bf6a..1340bec6cba0 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -188,27 +72,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -189,27 +73,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -107941,7 +108289,7 @@ index ba124401bf6a..1340bec6cba0 100644
  
      OS_LIBS += [
          "X11",
-@@ -220,20 +84,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+@@ -221,20 +85,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
          "Xrender"
      ]
  
diff --git a/mail/thunderbird/files/patch-modules_fdlibm_src_math__private.h b/mail/thunderbird/files/patch-modules_fdlibm_src_math__private.h
deleted file mode 100644
index 8d893f31e87c..000000000000
--- a/mail/thunderbird/files/patch-modules_fdlibm_src_math__private.h
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 7a20fbf537ee0867244109d1ea48a8ad9de2e4ea
-Author: Christoph Moench-Tegeder <cmt@burggraben.net>
-
-    align typedefs with our libm for historical CPUs
-
-diff --git modules/fdlibm/src/math_private.h modules/fdlibm/src/math_private.h
-index f4373f27834a..3b898241660f 100644
---- modules/fdlibm/src/math_private.h
-+++ modules/fdlibm/src/math_private.h
-@@ -30,9 +30,17 @@
-  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
-  */
- 
-+#ifdef __LP64__
- typedef double      __double_t;
-+#else
-+typedef long double __double_t;
-+#endif
- typedef __double_t  double_t;
-+#ifdef __LP64__
- typedef float       __float_t;
-+#else
-+typedef long double __float_t;
-+#endif
- 
- /*
-  * The original fdlibm code used statements like:
diff --git a/mail/thunderbird/files/patch-python_sites_mach.txt b/mail/thunderbird/files/patch-python_sites_mach.txt
index eb848fbdecf4..1d89a6123540 100644
--- a/mail/thunderbird/files/patch-python_sites_mach.txt
+++ b/mail/thunderbird/files/patch-python_sites_mach.txt
@@ -1,14 +1,19 @@
+commit 7c7760ecbc996ee3d1a2748b390e533298a3eb84
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    avoid problems with python modules in mach
+
 diff --git python/sites/mach.txt python/sites/mach.txt
-index 498e16ebba4f..4023a11d7e9a 100644
+index b985c6b0f509..1341caba271b 100644
 --- python/sites/mach.txt
 +++ python/sites/mach.txt
 @@ -58,15 +58,15 @@ pth:xpcom/geckoprocesstypes_generator
  pth:xpcom/idl-parser
  # glean-sdk may not be installable if a wheel isn't available
  # and it has to be built from source.
--pypi-optional:glean-sdk==67.1.0:telemetry will not be collected
+-pypi-optional:glean-sdk==67.2.0:telemetry will not be collected
 -pypi-optional:orjson>=3.10:json operations will be slower in various tools
-+# pypi-optional:glean-sdk==67.1.0:telemetry will not be collected
++# pypi-optional:glean-sdk==67.2.0:telemetry will not be collected
 +# pypi-optional:orjson>=3.10:json operations will be slower in various tools
  # Mach gracefully handles the case where `psutil` is unavailable.
  # We aren't (yet) able to pin packages in automation, so we have to
@@ -17,10 +22,10 @@ index 498e16ebba4f..4023a11d7e9a 100644
 -pypi-optional:rtoml>=0.11.0:toml operations will be slower in various tools
 -pypi-optional:zstandard>=0.11.1,<=0.25.0:zstd archives will not be possible to extract
 -vendored-fallback:pyyaml:third_party/python/pyyaml/lib/:faster native loading is disabled
-+# pypi-optional:psutil>=5.4.2,<=7.3.0:telemetry will be missing some data
++# pypi-optional:psutil>=5.4.2:telemetry will be missing some data
 +# pypi-optional:rtoml>=0.11.0:toml operations will be slower in various tools
 +# pypi-optional:zstandard>=0.11.1,<=0.25.0:zstd archives will not be possible to extract
-+vendored:third_party/python/pyyaml/lib/
++vendored:pyyaml:third_party/python/pyyaml/lib/
  vendored:third_party/python/ansicon
  vendored:third_party/python/appdirs
  vendored:third_party/python/async_timeout
diff --git a/mail/thunderbird/files/patch-sourcestamp.txt b/mail/thunderbird/files/patch-sourcestamp.txt
new file mode 100644
index 000000000000..3c324d01d0d1
--- /dev/null
+++ b/mail/thunderbird/files/patch-sourcestamp.txt
@@ -0,0 +1,6 @@
+--- sourcestamp.txt.orig
++++ sourcestamp.txt
+@@ -1 +1,3 @@
+ 20260515020702
++https://hg.mozilla.org/releases/comm-release/rev/82da0b799946d58ce8a7e3edd5008919a2fa7acb
++https://hg.mozilla.org/releases/mozilla-beta/rev/903d02bd0593077a014525321734716
diff --git a/mail/thunderbird/files/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland__egl__dmabuf.cc b/mail/thunderbird/files/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland__egl__dmabuf.cc
index 13a23c835960..5681775cdc62 100644
--- a/mail/thunderbird/files/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland__egl__dmabuf.cc
+++ b/mail/thunderbird/files/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland__egl__dmabuf.cc
@@ -1,10 +1,10 @@
-commit f53507857647459d4a48935901f80f27a5ae58a9
+commit 7ee076ab9ca300348d5662a894bf2d27e6724837
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
     avoid linux-only includes
 
 diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
-index 821fdfb487b7..e000c1c104fe 100644
+index c8653928d9e9..d380fc1b22f1 100644
 --- third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
 +++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
 @@ -15,7 +15,9 @@
@@ -17,3 +17,13 @@ index 821fdfb487b7..e000c1c104fe 100644
  #include <dlfcn.h>
  #include <fcntl.h>
  #include <gbm.h>
+@@ -23,7 +25,9 @@
+ #include <libdrm/drm_fourcc.h>
+ #include <spa/param/video/raw.h>
+ #include <sys/stat.h>
++#if !defined(__FreeBSD__)
+ #include <sys/sysmacros.h>
++#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <xf86drm.h>
diff --git a/mail/thunderbird/files/patch-toolkit_crashreporter_google-breakpad_src_common_linux_memory__mapped__file.cc b/mail/thunderbird/files/patch-toolkit_crashreporter_google-breakpad_src_common_linux_memory__mapped__file.cc
new file mode 100644
index 000000000000..ba52daa4686e
--- /dev/null
+++ b/mail/thunderbird/files/patch-toolkit_crashreporter_google-breakpad_src_common_linux_memory__mapped__file.cc
@@ -0,0 +1,40 @@
+commit d47074b830ce057d758b8d1e9200829824666cd5
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    disable linux-only code in crashreporter on FreeBSD
+    
+    The crashreporter itself is not active here anyway, but parts
+    of the code are still compiled for interface reasons. We skip
+    the parts which are linux-only.
+
+diff --git toolkit/crashreporter/google-breakpad/src/common/linux/memory_mapped_file.cc toolkit/crashreporter/google-breakpad/src/common/linux/memory_mapped_file.cc
+index c18ddb01f8bc..98506221e3ba 100644
+--- toolkit/crashreporter/google-breakpad/src/common/linux/memory_mapped_file.cc
++++ toolkit/crashreporter/google-breakpad/src/common/linux/memory_mapped_file.cc
+@@ -58,6 +58,9 @@ MemoryMappedFile::~MemoryMappedFile() {
+ 
+ bool MemoryMappedFile::Map(const char* path, size_t offset) {
+   Unmap();
++#if defined(__FreeBSD__)
++    return false;
++#else
+ 
+   int fd = sys_open(path, O_RDONLY, 0);
+   if (fd == -1) {
+@@ -97,13 +100,16 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
+ 
+   content_.Set(data, file_len - offset);
+   return true;
++#endif
+ }
+ 
+ void MemoryMappedFile::Unmap() {
++#if !defined(__FreeBSD__)
+   if (content_.data()) {
+     sys_munmap(const_cast<uint8_t*>(content_.data()), content_.length());
+     content_.Set(NULL, 0);
+   }
++#endif
+ }
+ 
+ }  // namespace google_breakpad
author	Christoph Moench-Tegeder <cmt@FreeBSD.org>	2026-05-15 21:15:11 +0100
committer	Christoph Moench-Tegeder <cmt@FreeBSD.org>	2026-05-15 21:17:10 +0100
commit	7086525af5d39c9964269bbe7c00835f4d72f075 (patch) (diff)
tree	1f109b529048ac7e7a5fbb30a754d7042d08ad0a
download	ports-2026Q2.tar.gz

previous commit	d1e0884c65118173640c42e392f8dc8093e62c12 (www/firefox-esr: update to 140.11.0 (rc2))