Attachment 254222 Details for Bug 281985 – 0001-librewolf-update-to-131.0.2.patch

[patch] 0001-librewolf-update-to-131.0.2.patch

0001-librewolf-update-to-131.0.2.patch (text/plain), 474.52 KB, created by Martin Filla on 2024-10-14 13:46:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Filla

Created: 2024-10-14 13:46:01 UTC

Size: 474.52 KB

patch

obsolete

>From c4b6173fd6e77f243bd42349125fe656bdd3c45b Mon Sep 17 00:00:00 2001
>From: Charlie Root <root@hades.lan>
>Date: Mon, 14 Oct 2024 15:45:01 +0200
>Subject: [PATCH] librewolf: update to 131.0.2
>
>---
> www/librewolf/Makefile                        |   27 +-
> www/librewolf/distinfo                        |    6 +-
> www/librewolf/files/patch-bug1559213          |   63 +-
> www/librewolf/files/patch-bug847568           |   91 +-
> .../patch-gfx_skia_skia_src_core_SkCpu.cpp    |   33 -
> www/librewolf/files/patch-libwebrtc-generated | 8418 +++++++++--------
> 6 files changed, 4752 insertions(+), 3886 deletions(-)
> delete mode 100644 www/librewolf/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
>
>diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
>index 3fb75f9e1d86..72c3c3b44d09 100644
>--- a/www/librewolf/Makefile
>+++ b/www/librewolf/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	librewolf
>-DISTVERSION=	129.0
>+DISTVERSION=	131.0.2
> DISTVERSIONSUFFIX=	-1.source
>-PORTREVISION=	2
> CATEGORIES=	www wayland
> MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}-1/
> 
>@@ -13,14 +12,14 @@ LICENSE=	MPL20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
>-		nss>=3.101:security/nss \
>+		nss>=3.104:security/nss \
> 		icu>=73.1:devel/icu \
> 		libevent>=2.1.8:devel/libevent \
>-		harfbuzz>=8.5.0:print/harfbuzz \
>+		harfbuzz>=9.0.0:print/harfbuzz \
> 		graphite2>=1.3.14:graphics/graphite2 \
> 		png>=1.6.43:graphics/png \
> 		dav1d>=1.0.0:multimedia/dav1d \
>-		libvpx>=1.14.0:multimedia/libvpx \
>+		libvpx>=1.14.1:multimedia/libvpx \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
> 		v4l_compat>0:multimedia/v4l_compat \
> 		autoconf2.13:devel/autoconf2.13 \
>@@ -64,9 +63,8 @@ MOZ_OPTIONS=	--enable-application=browser \
> 		MOZ_CRASHREPORTER=0 \
> 		MOZ_DATA_REPORTING=0
> 
>-FIREFOX_ICON=		${MOZILLA}.png
>-FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
>-FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
>+ FIREFOX_ICON=          ${MOZILLA}.png
>+ FIREFOX_ICON_SRC=      ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
> 
> .include "${.CURDIR}/../../www/firefox/Makefile.options"
> 
>@@ -86,18 +84,19 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:deve
> MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
> .endif
> 
>+post-extract:
>+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
>+		-e 's|firefox|${MOZILLA}|' \
>+		-e 's|Firefox|${MOZILLA_CAP}|' \
>+		${.CURDIR}/../firefox/files/firefox.desktop.in > ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
>-		-e 's/firefox/${MOZILLA}/' \
>-		-e 's/Firefox/${MOZILLA_CAP}/' \
>-		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
>-		${FIREFOX_DESKTOP}
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
> 		${WRKSRC}/browser/app/nsBrowserApp.cpp
> 	@${RM} ${WRKSRC}/mozconfig
> 
> post-install:
>-	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
>+	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
> 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
> 
>diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo
>index f61584dd92b8..deed1d342420 100644
>--- a/www/librewolf/distinfo
>+++ b/www/librewolf/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1723582244
>-SHA256 (librewolf-129.0-1.source.tar.gz) = ff03845699e62aa68f31fb7b17193636e9e8a63dd824011f3d84059574c9b09d
>-SIZE (librewolf-129.0-1.source.tar.gz) = 1016824247
>+TIMESTAMP = 1728576968
>+SHA256 (librewolf-131.0.2-1.source.tar.gz) = 74e4bbcd9108d7f04c8be6a52ab96aa23d6eef7e1a396215444b2028a0db5ae7
>+SIZE (librewolf-131.0.2-1.source.tar.gz) = 1035020649
>diff --git a/www/librewolf/files/patch-bug1559213 b/www/librewolf/files/patch-bug1559213
>index ae11fb38f989..ead3425fa70b 100644
>--- a/www/librewolf/files/patch-bug1559213
>+++ b/www/librewolf/files/patch-bug1559213
>@@ -1,17 +1,16 @@
>-commit 717bba28411c
>-Author: Jory A. Pratt <anarchy@gentoo.org>
>-Date:   Thu Jun 13 11:53:00 2019 -0700
>+commit 25a5572d5cd137aa6d893e09a00bd39908a59a18
>+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
>+Date:   Tue Sep 10 22:23:32 2024 +0200
> 
>-    Bug 1559213 - Allow to use system av1 libs instead of bundled.
>----
>- config/external/moz.build      |  5 +++--
>- config/system-headers.mozbuild |  8 ++++++++
>- dom/media/platforms/moz.build  |  5 +++++
>- toolkit/moz.configure          | 19 ++++++++++++++++++-
>- 4 files changed, 34 insertions(+), 3 deletions(-)
>+    based on:
>+     commit 717bba28411c
>+     Author: Jory A. Pratt <anarchy@gentoo.org>
>+     Date:   Thu Jun 13 11:53:00 2019 -0700
>+    
>+         Bug 1559213 - Allow to use system av1 libs instead of bundled.
> 
> diff --git config/external/moz.build config/external/moz.build
>-index 2fc8df57992e..63d18e50a961 100644
>+index a24b470396cf..547f5f5c9e04 100644
> --- config/external/moz.build
> +++ config/external/moz.build
> @@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
>@@ -27,10 +26,10 @@ index 2fc8df57992e..63d18e50a961 100644
>  if not CONFIG["MOZ_SYSTEM_PNG"]:
>      external_dirs += ["media/libpng"]
> diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build
>-index 5c6e25b3980b..ce99ebfb6d3f 100644
>+index 61536cc6e225..29cf635bbb44 100644
> --- dom/media/platforms/moz.build
> +++ dom/media/platforms/moz.build
>-@@ -81,6 +81,11 @@ if CONFIG["MOZ_AV1"]:
>+@@ -71,6 +71,11 @@ if CONFIG["MOZ_AV1"]:
>          "agnostic/AOMDecoder.cpp",
>          "agnostic/DAV1DDecoder.cpp",
>      ]
>@@ -43,10 +42,10 @@ index 5c6e25b3980b..ce99ebfb6d3f 100644
>  if CONFIG["MOZ_OMX"]:
>      EXPORTS += [
> diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build
>-index 761fc8cf4cd9..793a5b8697a8 100644
>+index 6f09049a6068..90a82a19a9d1 100644
> --- media/ffvpx/libavcodec/moz.build
> +++ media/ffvpx/libavcodec/moz.build
>-@@ -120,10 +120,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
>+@@ -119,10 +119,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
>          'vp9recon.c',
>          'vpx_rac.c',
>      ]
>@@ -57,6 +56,8 @@ index 761fc8cf4cd9..793a5b8697a8 100644
> +    if CONFIG["MOZ_SYSTEM_AV1"]:
> +        CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
> +        OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
>++        CFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS']
>++        OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS']
> +    else:
> +        USE_LIBS += [
> +            'dav1d',
>@@ -65,11 +66,37 @@ index 761fc8cf4cd9..793a5b8697a8 100644
>      if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
>          LOCAL_INCLUDES += ['/media/mozva']
>          SOURCES += [
>+diff --git media/libopus/moz.build media/libopus/moz.build
>+index 943aee79ee99..4ad07e3e98af 100644
>+--- media/libopus/moz.build
>++++ media/libopus/moz.build
>+@@ -58,7 +58,7 @@ if not CONFIG["MOZ_SAMPLE_TYPE_FLOAT32"]:
>+     DEFINES["FIXED_POINT"] = 1
>+     DEFINES["DISABLE_FLOAT_API"] = True
>+ 
>+-if CONFIG["OS_ARCH"] == "Linux":
>++if CONFIG["OS_ARCH"] in ("FreeBSD", "Linux"):
>+     OS_LIBS += [
>+         "m",
>+     ]
>+diff --git media/libvorbis/moz.build media/libvorbis/moz.build
>+index cd17d4f89759..816edd72a000 100644
>+--- media/libvorbis/moz.build
>++++ media/libvorbis/moz.build
>+@@ -45,7 +45,7 @@ LOCAL_INCLUDES += ['lib']
>+ if CONFIG['OS_ARCH'] == 'SunOS':
>+     DEFINES['HAVE_ALLOCA_H'] = True
>+ 
>+-if CONFIG["OS_ARCH"] == "Linux":
>++if CONFIG["OS_ARCH"] in ("FreeBSD", "Linux"):
>+     OS_LIBS += [
>+         "m",
>+     ]
> diff --git toolkit/moz.configure toolkit/moz.configure
>-index f93a5d64fec8..814357f4e979 100644
>+index 1f85d2831f2f..07294b93f850 100644
> --- toolkit/moz.configure
> +++ toolkit/moz.configure
>-@@ -744,7 +744,23 @@ def av1(value):
>+@@ -883,7 +883,23 @@ def av1(value):
>          return True
>  
>  
>@@ -94,7 +121,7 @@ index f93a5d64fec8..814357f4e979 100644
>  def dav1d_asm(target):
>      if target.cpu in ("aarch64", "x86", "x86_64"):
>          return True
>-@@ -760,6 +776,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
>+@@ -899,6 +915,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
>  set_define("MOZ_DAV1D_ASM", dav1d_asm)
>  set_config("MOZ_AV1", av1)
>  set_define("MOZ_AV1", av1)
>diff --git a/www/librewolf/files/patch-bug847568 b/www/librewolf/files/patch-bug847568
>index 6e2cccebff70..f3e7ecbc1a13 100644
>--- a/www/librewolf/files/patch-bug847568
>+++ b/www/librewolf/files/patch-bug847568
>@@ -1,8 +1,10 @@
>-# Allow building against system-wide graphite2/harfbuzz.
>+Allow building against system-wide graphite2/harfbuzz
> 
>---- config/system-headers.mozbuild.orig	2024-07-25 20:34:40 UTC
>+diff --git config/system-headers.mozbuild config/system-headers.mozbuild
>+index af44c89057fc..c0ac271917fb 100644
>+--- config/system-headers.mozbuild
> +++ config/system-headers.mozbuild
>-@@ -1305,6 +1305,19 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]:
>+@@ -1304,6 +1304,19 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]:
>          "proxy.h",
>      ]
>  
>@@ -22,9 +24,11 @@
>  if CONFIG["MOZ_SYSTEM_ICU"]:
>      system_headers += [
>          "unicode/calendar.h",
>---- dom/base/moz.build.orig	2024-07-25 20:34:40 UTC
>+diff --git dom/base/moz.build dom/base/moz.build
>+index 170d19f09aa9..a47fc8b1193c 100644
>+--- dom/base/moz.build
> +++ dom/base/moz.build
>-@@ -616,6 +616,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
>+@@ -620,6 +620,9 @@ FINAL_LIBRARY = "xul"
>  if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
>      CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
>  
>@@ -34,7 +38,10 @@
>  GeneratedFile(
>      "UseCounterList.h",
>      script="gen-usecounters.py",
>---- gfx/graphite2/geckoextra/moz.build.orig	2024-08-13 19:48:57 UTC
>+diff --git gfx/graphite2/geckoextra/moz.build gfx/graphite2/geckoextra/moz.build
>+new file mode 100644
>+index 000000000000..ed0323eba9d5
>+--- /dev/null
> +++ gfx/graphite2/geckoextra/moz.build
> @@ -0,0 +1,21 @@
> +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
>@@ -58,16 +65,21 @@
> +AllowCompilerWarnings()
> +
> +FINAL_LIBRARY = 'xul'
>---- gfx/harfbuzz/README-mozilla.fbsd.orig	2024-08-13 19:48:57 UTC
>+diff --git gfx/harfbuzz/README-mozilla.fbsd gfx/harfbuzz/README-mozilla.fbsd
>+new file mode 100644
>+index 000000000000..2a10eb1e2b42
>+--- /dev/null
> +++ gfx/harfbuzz/README-mozilla.fbsd
> @@ -0,0 +1,4 @@
> +The in-tree copy may be omitted during build by --with-system-harfbuzz.
> +Make sure to keep pkg-config version check within toolkit/moz.configure in sync
> +with checkout version or increment latest tag by one if it's not based
> +on upstream release.
>---- gfx/moz.build.orig	2024-07-25 20:34:43 UTC
>+diff --git gfx/moz.build gfx/moz.build
>+index 56ea317bedfc..07dd7f66f1bc 100644
>+--- gfx/moz.build
> +++ gfx/moz.build
>-@@ -10,6 +10,14 @@ with Files("wr/**"):
>+@@ -10,6 +10,14 @@ with Files("**"):
>  with Files("wr/**"):
>      BUG_COMPONENT = ("Core", "Graphics: WebRender")
>  
>@@ -91,7 +103,9 @@
>      "ots/src",
>      "thebes",
>      "ipc",
>---- gfx/skia/generate_mozbuild.py.orig	2024-07-25 20:34:42 UTC
>+diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py
>+index b589efde1c5c..47f49e10df70 100755
>+--- gfx/skia/generate_mozbuild.py
> +++ gfx/skia/generate_mozbuild.py
> @@ -95,6 +95,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
>          '-Wno-unused-private-field',
>@@ -103,7 +117,9 @@
>  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
>      LOCAL_INCLUDES += [
>          "/gfx/cairo/cairo/src",
>---- gfx/skia/moz.build.orig	2024-07-25 20:34:42 UTC
>+diff --git gfx/skia/moz.build gfx/skia/moz.build
>+index 7fee54534878..ba1a4038e4a0 100644
>+--- gfx/skia/moz.build
> +++ gfx/skia/moz.build
> @@ -623,6 +623,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
>          '-Wno-unused-private-field',
>@@ -115,9 +131,11 @@
>  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
>      LOCAL_INCLUDES += [
>          "/gfx/cairo/cairo/src",
>---- gfx/thebes/moz.build.orig	2024-07-25 20:34:42 UTC
>+diff --git gfx/thebes/moz.build gfx/thebes/moz.build
>+index 48f2849e2025..7d0a161a91b4 100644
>+--- gfx/thebes/moz.build
> +++ gfx/thebes/moz.build
>-@@ -295,7 +295,13 @@ LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
>+@@ -295,7 +295,13 @@ if CONFIG["MOZ_WAYLAND"]:
>  
>  LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
>  
>@@ -132,7 +150,9 @@
>  
>  CXXFLAGS += ["-Werror=switch"]
>  
>---- intl/unicharutil/util/moz.build.orig	2024-07-25 20:34:43 UTC
>+diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
>+index 2396210428ee..092baac6f79c 100644
>+--- intl/unicharutil/util/moz.build
> +++ intl/unicharutil/util/moz.build
> @@ -24,6 +24,9 @@ UNIFIED_SOURCES += [
>      "nsUnicodeProperties.cpp",
>@@ -144,9 +164,11 @@
>  include("/ipc/chromium/chromium-config.mozbuild")
>  
>  GeneratedFile(
>---- netwerk/dns/moz.build.orig	2024-07-25 20:34:48 UTC
>+diff --git netwerk/dns/moz.build netwerk/dns/moz.build
>+index 1bb0430f01aa..0360e0f468c0 100644
>+--- netwerk/dns/moz.build
> +++ netwerk/dns/moz.build
>-@@ -112,6 +112,9 @@ GeneratedFile(
>+@@ -111,6 +111,9 @@ GeneratedFile(
>      "etld_data.inc", script="prepare_tlds.py", inputs=["effective_tld_names.dat"]
>  )
>  
>@@ -156,12 +178,15 @@
>  # need to include etld_data.inc
>  LOCAL_INCLUDES += [
>      "/netwerk/base",
>---- old-configure.in.orig	2024-07-25 20:34:49 UTC
>+diff --git old-configure.in old-configure.in
>+index 1af75c496b15..f1c7d7c48d28 100644
>+--- old-configure.in
> +++ old-configure.in
>-@@ -704,6 +704,27 @@ dnl ==================================================
>+@@ -167,6 +167,27 @@ fi
>+ AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID)
>  AC_SUBST(MOZ_MACBUNDLE_ID)
>  
>- dnl ========================================================
>++dnl ========================================================
> +dnl Check for graphite2
> +dnl ========================================================
> +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
>@@ -182,13 +207,27 @@
> +    CFLAGS=$_SAVE_CFLAGS
> +fi
> +
>-+dnl ========================================================
>+ dnl ========================================================
>  dnl = Child Process Name for IPC
>  dnl ========================================================
>- if test "$MOZ_WIDGET_TOOLKIT" != "android"; then
>---- toolkit/library/moz.build.orig	2024-07-25 20:34:58 UTC
>+diff --git security/rlbox/moz.build security/rlbox/moz.build
>+index 7ad8d076f0f1..835b9d905e03 100644
>+--- security/rlbox/moz.build
>++++ security/rlbox/moz.build
>+@@ -47,6 +47,8 @@ if CONFIG["MOZ_WASM_SANDBOXING_GRAPHITE"]:
>+     for k, v in graphite_defines:
>+         WASM_DEFINES[k] = v
>+     LOCAL_INCLUDES += ["/gfx/graphite2/src"]
>++    if CONFIG["MOZ_SYSTEM_GRAPHITE2"]:
>++      WASM_CXXFLAGS += CONFIG["MOZ_GRAPHITE2_CFLAGS"]
>+ 
>+ if CONFIG["MOZ_WASM_SANDBOXING_OGG"]:
>+     include("/media/libogg/sources.mozbuild")
>+diff --git toolkit/library/moz.build toolkit/library/moz.build
>+index ee6051567c8e..c24a5a513bbc 100644
>+--- toolkit/library/moz.build
> +++ toolkit/library/moz.build
>-@@ -297,6 +297,12 @@ if CONFIG["MOZ_SYSTEM_WEBP"]:
>+@@ -298,6 +298,12 @@ if CONFIG["MOZ_SYSTEM_PNG"]:
>  if CONFIG["MOZ_SYSTEM_WEBP"]:
>      OS_LIBS += CONFIG["MOZ_WEBP_LIBS"]
>  
>@@ -201,9 +240,11 @@
>  if CONFIG["MOZ_SYSTEM_LIBEVENT"]:
>      OS_LIBS += CONFIG["MOZ_LIBEVENT_LIBS"]
>  
>---- toolkit/moz.configure.orig	2024-08-02 23:23:42 UTC
>+diff --git toolkit/moz.configure toolkit/moz.configure
>+index 1f85d2831f2f..04ce56e2cc0b 100644
>+--- toolkit/moz.configure
> +++ toolkit/moz.configure
>-@@ -1279,6 +1279,26 @@ set_config("CAIRO_FT_CFLAGS", ft2_info.cflags, when=en
>+@@ -1397,6 +1397,26 @@ def enable_cairo_ft(target, tree_freetype, freetype2_info):
>  set_config("MOZ_ENABLE_CAIRO_FT", True, when=enable_cairo_ft)
>  set_config("CAIRO_FT_CFLAGS", ft2_info.cflags, when=enable_cairo_ft)
>  
>diff --git a/www/librewolf/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/librewolf/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
>deleted file mode 100644
>index fe73016d6618..000000000000
>--- a/www/librewolf/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-Regressed by https://svnweb.freebsd.org/changeset/base/324815
>-
>-gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'getauxval'
>-        uint32_t hwcaps = getauxval(AT_HWCAP);
>-                          ^
>-
>-diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.cpp
>-index cdac7db2be2c..88391138880a 100644
>---- gfx/skia/skia/src/core/SkCpu.cpp
>-+++ gfx/skia/skia/src/core/SkCpu.cpp
>-@@ -81,6 +81,22 @@
>-         if (hwcap & HWCAP_LOONGARCH_LSX)  { features |= SkCpu::LOONGARCH_SX; }
>-         if (hwcap & HWCAP_LOONGARCH_LASX) { features |= SkCpu::LOONGARCH_ASX; }
>- 
>-+        return features;
>-+    }
>-+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)
>-+    #include <machine/armreg.h>
>-+    #ifndef ID_AA64ISAR0_CRC32_VAL
>-+    #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
>-+    #endif
>-+
>-+    static uint32_t read_cpu_features() {
>-+        uint32_t features = 0;
>-+        uint64_t id_aa64isar0;
>-+
>-+        id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
>-+        if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) {
>-+            features |= SkCpu::CRC32;
>-+        }
>-         return features;
>-     }
>- #else
>diff --git a/www/librewolf/files/patch-libwebrtc-generated b/www/librewolf/files/patch-libwebrtc-generated
>index c547d211c7d4..17702f82615d 100644
>--- a/www/librewolf/files/patch-libwebrtc-generated
>+++ b/www/librewolf/files/patch-libwebrtc-generated
>@@ -1,7 +1,8 @@
>-commit 8f47d0fc87c264faae3f47b2023f8a7eb4c36101
>+commit da3b4d2fa4d2a502149450e93d2ceaee9eb8d8e4
> Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
>+Date:   Wed Sep 18 20:59:22 2024 +0000
> 
>-    regenerate FreeBSD libwebrtc patch for Firefox 129
>+    regenerate FreeBSD libwebrtc patch for Firefox 131
> 
> 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 2dbd5881583e..332ca04819ee 100644
>@@ -1038,6 +1039,197 @@ index 746585483f96..33ea9b79d47b 100644
> +    DEFINES["USE_X11"] = "1"
>  
>  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 9609692094c1..f0da29e5d200 100644
>+--- third_party/libwebrtc/api/audio/audio_device_gn/moz.build
>++++ third_party/libwebrtc/api/audio/audio_device_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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"
>+ 
>+@@ -39,111 +49,17 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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":
>+ 
>+     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,50 +69,8 @@ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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("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 e2561db08f06..59da7761dd35 100644
> --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
>@@ -1641,10 +1833,10 @@ index 36d43783a3e7..fd0111ba0ffd 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
>  Library("audio_mixer_api_gn")
>-diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
>-index 06f43e765114..6c06b87bcfe3 100644
>---- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
>-+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
>+diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
>+index 7226d2a92a40..c60a400c218b 100644
>+--- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
>++++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -1667,7 +1859,7 @@ index 06f43e765114..6c06b87bcfe3 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -1764,6 +1956,10 @@ index 06f43e765114..6c06b87bcfe3 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -1780,10 +1976,12 @@ index 06f43e765114..6c06b87bcfe3 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -1805,16 +2003,21 @@ index 06f43e765114..6c06b87bcfe3 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -1824,18 +2027,27 @@ index 06f43e765114..6c06b87bcfe3 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("echo_control_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 5811f4d9321b..0f11017e2f6c 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
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 d7629659d6ba..cb69c23840a0 100644
>+--- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
>++++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -1858,7 +2070,7 @@ index 5811f4d9321b..0f11017e2f6c 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -1877,10 +2089,6 @@ index 5811f4d9321b..0f11017e2f6c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -1946,13 +2154,6 @@ index 5811f4d9321b..0f11017e2f6c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -2049,11 +2250,202 @@ index 5811f4d9321b..0f11017e2f6c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 f4fb06ef3f09..90113fd85d92 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
>+ Library("audio_processing_statistics_gn")
>+diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
>+index 06f43e765114..6c06b87bcfe3 100644
>+--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
>++++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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"
>+ 
>+@@ -39,111 +49,17 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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":
>+ 
>+     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,50 +69,8 @@ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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("echo_control_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 5811f4d9321b..0f11017e2f6c 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -2267,11 +2659,11 @@ index f4fb06ef3f09..90113fd85d92 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 faed7e9b0f61..84835da8965c 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
>+ 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 f4fb06ef3f09..90113fd85d92 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -2294,7 +2686,7 @@ index faed7e9b0f61..84835da8965c 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -2485,12 +2877,12 @@ index faed7e9b0f61..84835da8965c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 5de9c2960769..a0d91297b550 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
>-@@ -12,13 +12,23 @@ AllowCompilerWarnings()
>+ 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 faed7e9b0f61..84835da8965c 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -2504,8 +2896,6 @@ index 5de9c2960769..a0d91297b550 100644
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
> +DEFINES["WEBRTC_POSIX"] = True
>  DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
>- DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1"
>- DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1"
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>@@ -2514,7 +2904,7 @@ index 5de9c2960769..a0d91297b550 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -2562,10 +2952,6 @@ index 5de9c2960769..a0d91297b550 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -2709,11 +3095,11 @@ index 5de9c2960769..a0d91297b550 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 5ff7dfd0ffd4..334acbe7d342 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
>+ 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 5de9c2960769..a0d91297b550 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
> @@ -12,13 +12,23 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -2933,12 +3319,12 @@ index 5ff7dfd0ffd4..334acbe7d342 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 e1c8fa6a08bc..7799b83b91bb 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
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ 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 5ff7dfd0ffd4..334acbe7d342 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
>+@@ -12,13 +12,23 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -2952,6 +3338,8 @@ index e1c8fa6a08bc..7799b83b91bb 100644
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
> +DEFINES["WEBRTC_POSIX"] = True
>  DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
>+ DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1"
>+ DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1"
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>@@ -2960,7 +3348,7 @@ index e1c8fa6a08bc..7799b83b91bb 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -3008,6 +3396,10 @@ index e1c8fa6a08bc..7799b83b91bb 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -3151,11 +3543,229 @@ index e1c8fa6a08bc..7799b83b91bb 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 39513d15b310..aff5480ad0b3 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
>+ 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 e1c8fa6a08bc..7799b83b91bb 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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,185 +53,32 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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":
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 39513d15b310..aff5480ad0b3 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -8105,7 +8715,7 @@ index a6ac64bf50c6..541f2359270f 100644
> -
>  Library("field_trials_view_gn")
> diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
>-index 2ed19fd691d7..5a66e1d8aace 100644
>+index b79f531f5def..36790a9abbbb 100644
> --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
> +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>@@ -8130,7 +8740,7 @@ index 2ed19fd691d7..5a66e1d8aace 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -8234,6 +8844,10 @@ index 2ed19fd691d7..5a66e1d8aace 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -8250,10 +8864,12 @@ index 2ed19fd691d7..5a66e1d8aace 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -8275,16 +8891,21 @@ index 2ed19fd691d7..5a66e1d8aace 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -8294,13 +8915,22 @@ index 2ed19fd691d7..5a66e1d8aace 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["USE_X11"] = "1"
>+ 
>  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 feea8c2c0ba6..7c48aab74157 100644
>@@ -14295,10 +14925,10 @@ index 0885f16a0655..ef5775ccf647 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
>  Library("bandwidth_estimation_settings_gn")
>-diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
>-index 42410686d0be..82767eaae01a 100644
>---- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
>+diff --git third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
>+index 2f22fa141fe6..d7e6270a1b00 100644
>+--- third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
>++++ third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -14321,7 +14951,7 @@ index 42410686d0be..82767eaae01a 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -14414,10 +15044,6 @@ index 42410686d0be..82767eaae01a 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -14434,12 +15060,10 @@ index 42410686d0be..82767eaae01a 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -14461,21 +15085,16 @@ index 42410686d0be..82767eaae01a 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -14485,27 +15104,18 @@ index 42410686d0be..82767eaae01a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 e0f8f023787b..b9b426e20a50 100644
>---- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
>+-
>+ 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 42410686d0be..82767eaae01a 100644
>+--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
>++++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -14528,7 +15138,7 @@ index e0f8f023787b..b9b426e20a50 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -14547,10 +15157,6 @@ index e0f8f023787b..b9b426e20a50 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -14616,13 +15222,6 @@ index e0f8f023787b..b9b426e20a50 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -14632,6 +15231,10 @@ index e0f8f023787b..b9b426e20a50 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -14648,10 +15251,12 @@ index e0f8f023787b..b9b426e20a50 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -14673,16 +15278,21 @@ index e0f8f023787b..b9b426e20a50 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -14692,18 +15302,27 @@ index e0f8f023787b..b9b426e20a50 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("datagram_transport_interface_gn")
>-diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
>-index 0b2e41f78c7b..665be1aad89b 100644
>---- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 e0f8f023787b..b9b426e20a50 100644
>+--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
>++++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -14726,7 +15345,7 @@ index 0b2e41f78c7b..665be1aad89b 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -14830,10 +15449,6 @@ index 0b2e41f78c7b..665be1aad89b 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -14850,12 +15465,10 @@ index 0b2e41f78c7b..665be1aad89b 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -14877,21 +15490,16 @@ index 0b2e41f78c7b..665be1aad89b 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -14901,27 +15509,18 @@ index 0b2e41f78c7b..665be1aad89b 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- Library("field_trial_based_config_gn")
>-diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
>-index 70efa923b78f..6f3cfe2f16c5 100644
>---- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
>+-
>+ Library("datagram_transport_interface_gn")
>+diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
>+index 0b2e41f78c7b..665be1aad89b 100644
>+--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
>++++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -14944,7 +15543,7 @@ index 70efa923b78f..6f3cfe2f16c5 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -14964,7 +15563,6 @@ index 70efa923b78f..6f3cfe2f16c5 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -14993,10 +15591,6 @@ index 70efa923b78f..6f3cfe2f16c5 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -15140,11 +15734,11 @@ index 70efa923b78f..6f3cfe2f16c5 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 abbedfaee9af..08b107c8a46a 100644
>---- third_party/libwebrtc/api/transport/network_control_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
>+ Library("field_trial_based_config_gn")
>+diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
>+index 70efa923b78f..6f3cfe2f16c5 100644
>+--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
>++++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -15167,7 +15761,7 @@ index abbedfaee9af..08b107c8a46a 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -15187,6 +15781,7 @@ index abbedfaee9af..08b107c8a46a 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -15215,6 +15810,10 @@ index abbedfaee9af..08b107c8a46a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -15358,11 +15957,11 @@ index abbedfaee9af..08b107c8a46a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("network_control_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 16ec75fa0170..dc43798be44c 100644
>---- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
>+ 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 abbedfaee9af..08b107c8a46a 100644
>+--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
>++++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -15385,7 +15984,7 @@ index 16ec75fa0170..dc43798be44c 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -15473,6 +16072,13 @@ index 16ec75fa0170..dc43798be44c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -15569,11 +16175,11 @@ index 16ec75fa0170..dc43798be44c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 83c88e8037fe..3656e84885cd 100644
>---- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
>+ Library("network_control_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 16ec75fa0170..dc43798be44c 100644
>+--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
>++++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -15596,7 +16202,7 @@ index 83c88e8037fe..3656e84885cd 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -15684,13 +16290,6 @@ index 83c88e8037fe..3656e84885cd 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -15700,6 +16299,10 @@ index 83c88e8037fe..3656e84885cd 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -15716,10 +16319,224 @@ index 83c88e8037fe..3656e84885cd 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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":
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 83c88e8037fe..3656e84885cd 100644
>+--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
>++++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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"
>+ 
>+@@ -39,118 +49,17 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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":
>+ 
>+     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":
>+ 
>+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -21771,7 +22588,7 @@ index b0c90b8ad2ee..4933d9ebafdb 100644
>  
>  Library("scalability_mode_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 de1ff19cd39c..f5d7824d0dc2 100644
>+index f3060e020af9..175782549b6f 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>@@ -21796,7 +22613,7 @@ index de1ff19cd39c..f5d7824d0dc2 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -54,185 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -53,185 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -45512,7 +46329,7 @@ index ed716566a46d..b746c1697b38 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 3f2132cc91d8..d80bca19c048 100644
>+index 41cc41800770..d80bca19c048 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>@@ -45537,7 +46354,7 @@ index 3f2132cc91d8..d80bca19c048 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -45625,6 +46442,13 @@ index 3f2132cc91d8..d80bca19c048 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -49707,16 +50531,17 @@ index 00e3216b4597..8f4f2eb9cd09 100644
> +    DEFINES["USE_X11"] = "1"
>  
>  Library("vad_wrapper_gn")
>-diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
>-index e0d5597d5605..73327af215a3 100644
>---- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+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 9b5e11e947d9..1bd5feb70d36 100644
>+--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
>+@@ -12,12 +12,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  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_ENABLE_LIBEVENT"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>@@ -49733,7 +50558,7 @@ index e0d5597d5605..73327af215a3 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -49781,6 +50606,10 @@ index e0d5597d5605..73327af215a3 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -49924,11 +50753,11 @@ index e0d5597d5605..73327af215a3 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("api_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 9b5e11e947d9..1bd5feb70d36 100644
>---- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
>+ 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 986ecc61c766..3d9e6a75e276 100644
>+--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
> @@ -12,12 +12,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -49952,7 +50781,7 @@ index 9b5e11e947d9..1bd5feb70d36 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -50147,18 +50976,17 @@ index 9b5e11e947d9..1bd5feb70d36 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 986ecc61c766..3d9e6a75e276 100644
>---- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
>-@@ -12,12 +12,22 @@ AllowCompilerWarnings()
>+ 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 894361b57458..c605bd008d4e 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  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_ENABLE_LIBEVENT"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>@@ -50175,7 +51003,7 @@ index 986ecc61c766..3d9e6a75e276 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -50223,10 +51051,6 @@ index 986ecc61c766..3d9e6a75e276 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -50370,11 +51194,11 @@ index 986ecc61c766..3d9e6a75e276 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 894361b57458..c605bd008d4e 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
>+ 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 9f4a7293e302..e9b1dc9e853e 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -50397,7 +51221,7 @@ index 894361b57458..c605bd008d4e 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -50501,10 +51325,6 @@ index 894361b57458..c605bd008d4e 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -50521,214 +51341,7 @@ index 894361b57458..c605bd008d4e 100644
>  
>  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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>--
>--    OS_LIBS += [
>--        "unwind"
>--    ]
>--
>--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":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 7a283f1e109a..e9b1dc9e853e 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
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- 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"
>- 
>-@@ -39,111 +49,17 @@ 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"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    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_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["TARGET_CPU"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--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":
>- 
>-     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,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>  
>      DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>@@ -51003,10 +51616,10 @@ index 4acaa7f014eb..66c1eab00fc1 100644
> +    DEFINES["USE_X11"] = "1"
>  
>  Library("audio_processing_gn")
>-diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
>-index 4f36694047af..1fac698b31d9 100644
>---- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
>+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 ba0901058580..d8273687ada4 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -51029,7 +51642,7 @@ index 4f36694047af..1fac698b31d9 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -51048,6 +51661,10 @@ index 4f36694047af..1fac698b31d9 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -51073,6 +51690,10 @@ index 4f36694047af..1fac698b31d9 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -51113,6 +51734,13 @@ index 4f36694047af..1fac698b31d9 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -51209,17 +51837,18 @@ index 4f36694047af..1fac698b31d9 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("audio_processing_statistics_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 ba0901058580..d8273687ada4 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
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ 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 2fd9b99a64df..62d3f34fa3be 100644
>+--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
>+@@ -12,12 +12,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  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_ENABLE_LIBEVENT"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>@@ -51431,11 +52060,233 @@ index ba0901058580..d8273687ada4 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 2fd9b99a64df..62d3f34fa3be 100644
>---- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/gain_controller2_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 09d5dc988247..ce4fc0c9b48a 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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,189 +53,32 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
>+-
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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":
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["USE_X11"] = "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 93c673ef1703..87ffa3a5cf65 100644
>+--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
> @@ -12,12 +12,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -51459,7 +52310,7 @@ index 2fd9b99a64df..62d3f34fa3be 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -56,189 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -51654,11 +52505,11 @@ index 2fd9b99a64df..62d3f34fa3be 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 09d5dc988247..ce4fc0c9b48a 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
>+ Library("ns_gn")
>+diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
>+index 0af06a9c3544..8e0e151a81c8 100644
>+--- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -51876,18 +52727,17 @@ index 09d5dc988247..ce4fc0c9b48a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "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 93c673ef1703..87ffa3a5cf65 100644
>---- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
>-@@ -12,12 +12,22 @@ AllowCompilerWarnings()
>+ Library("optionally_built_submodule_creators_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 8b21dc34fd6c..3a7dc84732d1 100644
>+--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  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_ENABLE_LIBEVENT"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>@@ -51904,7 +52754,7 @@ index 93c673ef1703..87ffa3a5cf65 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -56,189 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -51952,10 +52802,6 @@ index 93c673ef1703..87ffa3a5cf65 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -51996,13 +52842,6 @@ index 93c673ef1703..87ffa3a5cf65 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -52099,11 +52938,11 @@ index 93c673ef1703..87ffa3a5cf65 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("ns_gn")
>-diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
>-index 0af06a9c3544..8e0e151a81c8 100644
>---- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
>+ Library("rms_level_gn")
>+diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
>+index f3ccbefcdb8e..53e064f05b08 100644
>+--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52126,7 +52965,7 @@ index 0af06a9c3544..8e0e151a81c8 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -52145,10 +52984,6 @@ index 0af06a9c3544..8e0e151a81c8 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -52174,10 +53009,6 @@ index 0af06a9c3544..8e0e151a81c8 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -52218,13 +53049,6 @@ index 0af06a9c3544..8e0e151a81c8 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -52234,10 +53058,6 @@ index 0af06a9c3544..8e0e151a81c8 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -52254,12 +53074,10 @@ index 0af06a9c3544..8e0e151a81c8 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -52281,21 +53099,16 @@ index 0af06a9c3544..8e0e151a81c8 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -52305,27 +53118,18 @@ index 0af06a9c3544..8e0e151a81c8 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- Library("optionally_built_submodule_creators_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 8b21dc34fd6c..3a7dc84732d1 100644
>---- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
>+-
>+ Library("transient_suppressor_api_gn")
>+diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
>+index 0ec5dcb6c535..b42e3cf6c30e 100644
>+--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52348,7 +53152,7 @@ index 8b21dc34fd6c..3a7dc84732d1 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -52396,6 +53200,10 @@ index 8b21dc34fd6c..3a7dc84732d1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -52436,6 +53244,13 @@ index 8b21dc34fd6c..3a7dc84732d1 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -52532,11 +53347,11 @@ index 8b21dc34fd6c..3a7dc84732d1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("rms_level_gn")
>-diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
>-index f3ccbefcdb8e..53e064f05b08 100644
>---- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
>+ Library("transient_suppressor_impl_gn")
>+diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
>+index 50a6a9d55ce5..418e3f81e786 100644
>+--- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52559,7 +53374,7 @@ index f3ccbefcdb8e..53e064f05b08 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -52578,6 +53393,10 @@ index f3ccbefcdb8e..53e064f05b08 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -52652,6 +53471,10 @@ index f3ccbefcdb8e..53e064f05b08 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -52668,10 +53491,12 @@ index f3ccbefcdb8e..53e064f05b08 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -52693,16 +53518,21 @@ index f3ccbefcdb8e..53e064f05b08 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -52712,18 +53542,27 @@ index f3ccbefcdb8e..53e064f05b08 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("transient_suppressor_api_gn")
>-diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
>-index 0ec5dcb6c535..b42e3cf6c30e 100644
>---- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ Library("voice_probability_delay_unit_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 f1b3493b7a96..93278d71202e 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52746,7 +53585,7 @@ index 0ec5dcb6c535..b42e3cf6c30e 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -52794,10 +53633,6 @@ index 0ec5dcb6c535..b42e3cf6c30e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -52838,13 +53673,6 @@ index 0ec5dcb6c535..b42e3cf6c30e 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -52941,11 +53769,11 @@ index 0ec5dcb6c535..b42e3cf6c30e 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("transient_suppressor_impl_gn")
>-diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
>-index 50a6a9d55ce5..418e3f81e786 100644
>---- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
>+ 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 12b385e2e905..fc6f3d337810 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52968,7 +53796,7 @@ index 50a6a9d55ce5..418e3f81e786 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53152,11 +53980,11 @@ index 50a6a9d55ce5..418e3f81e786 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("voice_probability_delay_unit_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 f1b3493b7a96..93278d71202e 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
>+ Library("legacy_delay_estimator_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 f1e1bc555af4..7ef8884828c3 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -53363,11 +54191,11 @@ index f1b3493b7a96..93278d71202e 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 12b385e2e905..fc6f3d337810 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
>+ 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 4794a478e8a0..8cf74ef26590 100644
>+--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
>++++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -53390,7 +54218,7 @@ index 12b385e2e905..fc6f3d337810 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -50,189 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53438,6 +54266,10 @@ index 12b385e2e905..fc6f3d337810 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -53478,6 +54310,13 @@ index 12b385e2e905..fc6f3d337810 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -53574,11 +54413,11 @@ index 12b385e2e905..fc6f3d337810 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("legacy_delay_estimator_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 f1e1bc555af4..7ef8884828c3 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
>+ 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 614d8e5ebc43..b20264e2e6c3 100644
>+--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
>++++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -53601,7 +54440,7 @@ index f1e1bc555af4..7ef8884828c3 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53621,6 +54460,7 @@ index f1e1bc555af4..7ef8884828c3 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -53649,6 +54489,10 @@ index f1e1bc555af4..7ef8884828c3 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -53689,6 +54533,13 @@ index f1e1bc555af4..7ef8884828c3 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -53785,11 +54636,11 @@ index f1e1bc555af4..7ef8884828c3 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 4794a478e8a0..8cf74ef26590 100644
>---- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
>+ 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 2a3d216e40c0..099616509cba 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -53812,7 +54663,7 @@ index 4794a478e8a0..8cf74ef26590 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -50,189 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53860,10 +54711,6 @@ index 4794a478e8a0..8cf74ef26590 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -54007,13 +54854,13 @@ index 4794a478e8a0..8cf74ef26590 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 59d06c939618..1fda98e1fc3f 100644
>---- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
>-+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
>-@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+ 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 4cb60b5d0dc7..50814029b56f 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -54034,7 +54881,7 @@ index 59d06c939618..1fda98e1fc3f 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54230,11 +55077,11 @@ index 59d06c939618..1fda98e1fc3f 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 2a3d216e40c0..099616509cba 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
>+ 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 ad88ce9e6090..6d3e24fb02c2 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -54257,225 +55104,7 @@ index 2a3d216e40c0..099616509cba 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ 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"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    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_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["TARGET_CPU"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>--
>--    OS_LIBS += [
>--        "unwind"
>--    ]
>--
>--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":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 b138b59fc656..7e2398647c6a 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,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>- DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- 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"
>- 
>-@@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -48,189 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54495,7 +55124,6 @@ index b138b59fc656..7e2398647c6a 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -54671,13 +55299,13 @@ index b138b59fc656..7e2398647c6a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 47ee346c89e8..2bd76ccbe13d 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,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+ 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 6b0c2966167e..f5da2b2521ed 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -54698,7 +55326,7 @@ index 47ee346c89e8..2bd76ccbe13d 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -49,189 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54718,229 +55346,7 @@ index 47ee346c89e8..2bd76ccbe13d 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "log"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    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_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
>--
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["TARGET_CPU"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>--
>--    OS_LIBS += [
>--        "unwind"
>--    ]
>--
>--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":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 fa641fccfe18..fc883ee32524 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,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>- DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- 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,190 +54,32 @@ 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"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "GLESv2",
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -55329,11 +55735,11 @@ index d229d732df78..f1c13c16cc7d 100644
>  
>  Library("link_capacity_estimator_gn")
> diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
>-index 8065861f7854..efe50771e696 100644
>+index bdf6228cc4e1..71a2c7a73bad 100644
> --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
> +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
>-@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -55354,7 +55760,7 @@ index 8065861f7854..efe50771e696 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -56205,11 +56611,11 @@ index af00c0132302..35073ee314de 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 52323451eb32..bbdcd96a5813 100644
>+index 0314d2e9f767..f43abadb7e06 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,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -56230,7 +56636,7 @@ index 52323451eb32..bbdcd96a5813 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -57649,10 +58055,10 @@ index a4fb8b3162bd..f70faede2fba 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 6b5cd9286eb3..000000000000
>+index 0a76b27ceb41..000000000000
> --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_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/.
>@@ -57703,6 +58109,7 @@ index 6b5cd9286eb3..000000000000
> -    "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_iosurface.mm",
> -    "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_provider.mm",
> -    "/third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_mac.mm",
>+-    "/third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_sck.mm",
> -    "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm",
> -    "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_darwin.mm",
> -    "/third_party/libwebrtc/modules/desktop_capture/window_capturer_mac.mm",
>@@ -58979,12 +59386,12 @@ index 93af22612ea0..d0d2d4a27fe2 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>-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 eab6f3f9d0fc..473f820cccd1 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,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+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 fa0e8cc1c8f2..26732fc4bc22 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -59005,7 +59412,7 @@ index eab6f3f9d0fc..473f820cccd1 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -55,189 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59200,11 +59607,11 @@ index eab6f3f9d0fc..473f820cccd1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("remote_bitrate_estimator_gn")
>-diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
>-index 6e1dfd18c099..42e99603f4f1 100644
>---- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
>-+++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
>+ 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 121be23bf87b..f174efad3e75 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59227,7 +59634,7 @@ index 6e1dfd18c099..42e99603f4f1 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -52,189 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59246,6 +59653,10 @@ index 6e1dfd18c099..42e99603f4f1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -59271,6 +59682,10 @@ index 6e1dfd18c099..42e99603f4f1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -59311,6 +59726,13 @@ index 6e1dfd18c099..42e99603f4f1 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -59407,11 +59829,11 @@ index 6e1dfd18c099..42e99603f4f1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("leb128_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 b3425d3e67cf..e794e8940e60 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
>+ 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 9e1e50f3e0e2..888e4d1d91b8 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59434,7 +59856,209 @@ index b3425d3e67cf..e794e8940e60 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -85,189 +95,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,122 +49,17 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
>+-
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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":
>+ 
>+     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":
>+ 
>+@@ -164,50 +69,8 @@ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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("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 d9396081112f..bd5d9c4bfc37 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59629,13 +60253,13 @@ index b3425d3e67cf..e794e8940e60 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 31789273913d..67c5cb6da114 100644
>---- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
>-+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
>-@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+ 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 6e1dfd18c099..42e99603f4f1 100644
>+--- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
>++++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -59656,7 +60280,7 @@ index 31789273913d..67c5cb6da114 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -99,190 +109,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59675,11 +60299,6 @@ index 31789273913d..67c5cb6da114 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -59705,10 +60324,6 @@ index 31789273913d..67c5cb6da114 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -59749,13 +60364,6 @@ index 31789273913d..67c5cb6da114 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -59852,11 +60460,11 @@ index 31789273913d..67c5cb6da114 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 bdee5bedc6db..1e2ecfd55661 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
>+ 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 d3c4652d07e2..82c66ea467fa 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59879,7 +60487,7 @@ index bdee5bedc6db..1e2ecfd55661 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59927,6 +60535,10 @@ index bdee5bedc6db..1e2ecfd55661 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -60070,11 +60682,11 @@ index bdee5bedc6db..1e2ecfd55661 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 9afa4154ee37..d211f0d4e0c2 100644
>---- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
>-+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
>+ 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 ef123804746a..1acac7401f6f 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60097,7 +60709,7 @@ index 9afa4154ee37..d211f0d4e0c2 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -86,189 +96,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60116,6 +60728,10 @@ index 9afa4154ee37..d211f0d4e0c2 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -60141,6 +60757,10 @@ index 9afa4154ee37..d211f0d4e0c2 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -60181,6 +60801,13 @@ index 9afa4154ee37..d211f0d4e0c2 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -60190,7 +60817,7 @@ index 9afa4154ee37..d211f0d4e0c2 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -60248,7 +60875,7 @@ index 9afa4154ee37..d211f0d4e0c2 100644
> -
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
> -
>-     CFLAGS += [
>+     CXXFLAGS += [
>          "-msse2"
>      ]
>  
>@@ -60263,7 +60890,7 @@ index 9afa4154ee37..d211f0d4e0c2 100644
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
> +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-msse2"
> -    ]
> +if CONFIG["TARGET_CPU"] == "x86_64":
>@@ -60277,11 +60904,11 @@ index 9afa4154ee37..d211f0d4e0c2 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 2fa1910cc844..6accc1d41aba 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
>+ 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 18691e659af3..abd8389b1a2f 100644
>+--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
>++++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60304,7 +60931,7 @@ index 2fa1910cc844..6accc1d41aba 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -97,190 +107,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60323,6 +60950,11 @@ index 2fa1910cc844..6accc1d41aba 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -60348,6 +60980,10 @@ index 2fa1910cc844..6accc1d41aba 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -60388,6 +61024,13 @@ index 2fa1910cc844..6accc1d41aba 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -60397,7 +61040,7 @@ index 2fa1910cc844..6accc1d41aba 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -60455,7 +61098,7 @@ index 2fa1910cc844..6accc1d41aba 100644
> -
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
> -
>-     CFLAGS += [
>+     CXXFLAGS += [
>          "-msse2"
>      ]
>  
>@@ -60470,7 +61113,7 @@ index 2fa1910cc844..6accc1d41aba 100644
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
> +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-msse2"
> -    ]
> +if CONFIG["TARGET_CPU"] == "x86_64":
>@@ -60484,11 +61127,11 @@ index 2fa1910cc844..6accc1d41aba 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 d1ff3aaad348..f7b9d5799283 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
>+ 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 bdee5bedc6db..1e2ecfd55661 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60511,7 +61154,7 @@ index d1ff3aaad348..f7b9d5799283 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -47,174 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60530,6 +61173,10 @@ index d1ff3aaad348..f7b9d5799283 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -60595,6 +61242,13 @@ index d1ff3aaad348..f7b9d5799283 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -60604,7 +61258,7 @@ index d1ff3aaad348..f7b9d5799283 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -60662,7 +61316,7 @@ index d1ff3aaad348..f7b9d5799283 100644
> -
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
> -
>-     CFLAGS += [
>+     CXXFLAGS += [
>          "-msse2"
>      ]
>  
>@@ -60677,7 +61331,7 @@ index d1ff3aaad348..f7b9d5799283 100644
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
> +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-msse2"
> -    ]
> +if CONFIG["TARGET_CPU"] == "x86_64":
>@@ -60691,11 +61345,11 @@ index d1ff3aaad348..f7b9d5799283 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 97d828d64fc1..bd10964445c7 100644
>---- third_party/libwebrtc/modules/utility/utility_gn/moz.build
>-+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
>+ 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 9afa4154ee37..d211f0d4e0c2 100644
>+--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
>++++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60718,7 +61372,7 @@ index 97d828d64fc1..bd10964445c7 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,115 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60737,14 +61391,6 @@ index 97d828d64fc1..bd10964445c7 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/utility/source/helpers_android.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -60819,6 +61465,10 @@ index 97d828d64fc1..bd10964445c7 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -60835,10 +61485,12 @@ index 97d828d64fc1..bd10964445c7 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -157,60 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -60860,15 +61512,10 @@ index 97d828d64fc1..bd10964445c7 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>+-    DEFINES["USE_X11"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
>@@ -60876,10 +61523,10 @@ index 97d828d64fc1..bd10964445c7 100644
> -
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
> -
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>+     CFLAGS += [
>+         "-msse2"
>+     ]
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
> -
> -    DEFINES["_GNU_SOURCE"] = True
>@@ -60889,19 +61536,28 @@ index 97d828d64fc1..bd10964445c7 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 6af27f618bcd..d418565bbd05 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
>-@@ -14,11 +14,21 @@ AllowCompilerWarnings()
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 2fa1910cc844..6accc1d41aba 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -60923,18 +61579,7 @@ index 6af27f618bcd..d418565bbd05 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -33,6 +43,10 @@ LOCAL_INCLUDES += [
>- ]
>- 
>- UNIFIED_SOURCES += [
>-+    "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>-+    "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>-+    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>-+    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc",
>-     "/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
>- ]
>- 
>-@@ -45,152 +59,13 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60953,10 +61598,6 @@ index 6af27f618bcd..d418565bbd05 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -60982,17 +61623,6 @@ index 6af27f618bcd..d418565bbd05 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -61007,13 +61637,6 @@ index 6af27f618bcd..d418565bbd05 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -61040,38 +61663,16 @@ index 6af27f618bcd..d418565bbd05 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "ole32",
>--        "oleaut32",
>--        "secur32",
>--        "strmiids",
>--        "user32",
>--        "winmm"
>--    ]
>--
>--    SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/windows/device_info_ds.cc",
>--        "/third_party/libwebrtc/modules/video_capture/windows/help_functions_ds.cc",
>--        "/third_party/libwebrtc/modules/video_capture/windows/sink_filter_ds.cc"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_ds.cc",
>--        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_factory_windows.cc"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>  
>      DEFINES["WEBRTC_ARCH_ARM64"] = True
>      DEFINES["WEBRTC_HAS_NEON"] = True
>--
>+ 
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>+-    CFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -61079,43 +61680,18 @@ index 6af27f618bcd..d418565bbd05 100644
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>--if CONFIG["TARGET_CPU"] == "mips32":
>--
>--    DEFINES["MIPS32_LE"] = True
>--    DEFINES["MIPS_FPU_LE"] = True
>-     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>- 
>-     LOCAL_INCLUDES += [
>-         "/gfx/angle/checkout/include/",
>-@@ -209,76 +84,11 @@ if CONFIG["TARGET_CPU"] == "mips32":
>-         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>-     ]
>+ if CONFIG["TARGET_CPU"] == "mips32":
>  
>--if CONFIG["TARGET_CPU"] == "mips64":
>--
>--    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
>+     DEFINES["MIPS32_LE"] = True
>+     DEFINES["MIPS_FPU_LE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    LOCAL_INCLUDES += [
>--        "/gfx/angle/checkout/include/",
>--        "/third_party/drm/drm/",
>--        "/third_party/drm/drm/include/",
>--        "/third_party/drm/drm/include/libdrm/",
>--        "/third_party/gbm/gbm/",
>--        "/third_party/libepoxy/libepoxy/include/",
>--        "/third_party/pipewire/"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>--    ]
>--
>--if CONFIG["TARGET_CPU"] == "x86":
>+-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":
>@@ -61154,75 +61730,40 @@ index 6af27f618bcd..d418565bbd05 100644
> -
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
> -
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>-+if CONFIG["TARGET_CPU"] == "mips32":
>- 
>-+    DEFINES["MIPS32_LE"] = True
>-+    DEFINES["MIPS_FPU_LE"] = True
>-     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>- 
>-     LOCAL_INCLUDES += [
>-         "/gfx/angle/checkout/include/",
>-@@ -297,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>-         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>+     CFLAGS += [
>+         "-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":
>-+if CONFIG["TARGET_CPU"] == "mips64":
>- 
>-     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>- 
>-     LOCAL_INCLUDES += [
>-         "/gfx/angle/checkout/include/",
>-@@ -319,14 +128,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
>-         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>-     ]
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+if CONFIG["TARGET_CPU"] == "x86":
>- 
>-     CXXFLAGS += [
>-         "-msse2"
>-     ]
>- 
> +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>-     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>  
>-     LOCAL_INCLUDES += [
>-         "/gfx/angle/checkout/include/",
>-@@ -345,10 +154,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>-     ]
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>+-    CFLAGS += [
>+-        "-msse2"
>+-    ]
> +if CONFIG["TARGET_CPU"] == "x86_64":
>  
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>-     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>-     LOCAL_INCLUDES += [
>-         "/gfx/angle/checkout/include/",
>-@@ -367,4 +176,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>-     ]
>- 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
> +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>-+
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>-+
>- Library("video_capture_internal_impl_gn")
>-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 145e54928644..d53c45076c66 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
>+ 
>+ 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 d1ff3aaad348..f7b9d5799283 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -61245,7 +61786,7 @@ index 145e54928644..d53c45076c66 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,174 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -61264,10 +61805,6 @@ index 145e54928644..d53c45076c66 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -61293,10 +61830,6 @@ index 145e54928644..d53c45076c66 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -61337,13 +61870,6 @@ index 145e54928644..d53c45076c66 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -61353,7 +61879,7 @@ index 145e54928644..d53c45076c66 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>+-    CFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -61411,7 +61937,7 @@ index 145e54928644..d53c45076c66 100644
> -
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
> -
>-     CXXFLAGS += [
>+     CFLAGS += [
>          "-msse2"
>      ]
>  
>@@ -61426,7 +61952,7 @@ index 145e54928644..d53c45076c66 100644
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
> +    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>--    CXXFLAGS += [
>+-    CFLAGS += [
> -        "-msse2"
> -    ]
> +if CONFIG["TARGET_CPU"] == "x86_64":
>@@ -61440,11 +61966,11 @@ index 145e54928644..d53c45076c66 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 065cf604b5d3..e9eebffdbcd2 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
>+ 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 97d828d64fc1..bd10964445c7 100644
>+--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
>++++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -61467,7 +61993,7 @@ index 065cf604b5d3..e9eebffdbcd2 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,115 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -61490,6 +62016,10 @@ index 065cf604b5d3..e9eebffdbcd2 100644
> -        "log"
> -    ]
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/utility/source/helpers_android.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -61555,13 +62085,6 @@ index 065cf604b5d3..e9eebffdbcd2 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -61571,10 +62094,6 @@ index 065cf604b5d3..e9eebffdbcd2 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -61591,12 +62110,10 @@ index 065cf604b5d3..e9eebffdbcd2 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -157,60 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -61618,21 +62135,26 @@ index 065cf604b5d3..e9eebffdbcd2 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
> -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
>@@ -61642,28 +62164,19 @@ index 065cf604b5d3..e9eebffdbcd2 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 53a7fc384c3d..bd7362a67f30 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
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+-
>+ 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 6af27f618bcd..d418565bbd05 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
>+@@ -14,11 +14,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -61685,7 +62198,18 @@ index 53a7fc384c3d..bd7362a67f30 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -33,6 +43,10 @@ LOCAL_INCLUDES += [
>+ ]
>+ 
>+ UNIFIED_SOURCES += [
>++    "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>++    "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>++    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>++    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc",
>+     "/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
>+ ]
>+ 
>+@@ -45,152 +59,13 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -61733,6 +62257,17 @@ index 53a7fc384c3d..bd7362a67f30 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -61747,6 +62282,13 @@ index 53a7fc384c3d..bd7362a67f30 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -61773,35 +62315,88 @@ index 53a7fc384c3d..bd7362a67f30 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "ole32",
>+-        "oleaut32",
>+-        "secur32",
>+-        "strmiids",
>+-        "user32",
>+-        "winmm"
>+-    ]
>+-
>+-    SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/windows/device_info_ds.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/windows/help_functions_ds.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/windows/sink_filter_ds.cc"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_ds.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_factory_windows.cc"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>  
>      DEFINES["WEBRTC_ARCH_ARM64"] = True
>      DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>+-
> -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"] == "mips32":
>- 
>-     DEFINES["MIPS32_LE"] = True
>-     DEFINES["MIPS_FPU_LE"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["TARGET_CPU"] == "mips64":
>+-if CONFIG["TARGET_CPU"] == "mips32":
> -
>+-    DEFINES["MIPS32_LE"] = True
>+-    DEFINES["MIPS_FPU_LE"] = True
>+     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>  
>- if CONFIG["TARGET_CPU"] == "x86":
>- 
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+     LOCAL_INCLUDES += [
>+         "/gfx/angle/checkout/include/",
>+@@ -209,76 +84,11 @@ if CONFIG["TARGET_CPU"] == "mips32":
>+         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>+     ]
>  
>+-if CONFIG["TARGET_CPU"] == "mips64":
>+-
>+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-    LOCAL_INCLUDES += [
>+-        "/gfx/angle/checkout/include/",
>+-        "/third_party/drm/drm/",
>+-        "/third_party/drm/drm/include/",
>+-        "/third_party/drm/drm/include/libdrm/",
>+-        "/third_party/gbm/gbm/",
>+-        "/third_party/libepoxy/libepoxy/include/",
>+-        "/third_party/pipewire/"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.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
>@@ -61823,37 +62418,86 @@ index 53a7fc384c3d..bd7362a67f30 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
> -
>--    DEFINES["_GNU_SOURCE"] = True
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
> -
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>++if CONFIG["TARGET_CPU"] == "mips32":
>+ 
>++    DEFINES["MIPS32_LE"] = True
>++    DEFINES["MIPS_FPU_LE"] = True
>+     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+ 
>+     LOCAL_INCLUDES += [
>+         "/gfx/angle/checkout/include/",
>+@@ -297,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>+         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>+     ]
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
>--
>++if CONFIG["TARGET_CPU"] == "mips64":
>+ 
>+     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--
>+ 
>+     LOCAL_INCLUDES += [
>+         "/gfx/angle/checkout/include/",
>+@@ -319,14 +128,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
>+         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>+     ]
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++if CONFIG["TARGET_CPU"] == "x86":
>+ 
>+     CXXFLAGS += [
>+         "-msse2"
>+     ]
>+ 
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--
>+ 
>+     LOCAL_INCLUDES += [
>+         "/gfx/angle/checkout/include/",
>+@@ -345,10 +154,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>+         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>+     ]
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+     DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 b9784482e9bd..d6db6b79cea3 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
>+ 
>+     LOCAL_INCLUDES += [
>+         "/gfx/angle/checkout/include/",
>+@@ -367,4 +176,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>+         "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
>+     ]
>+ 
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>++
>++    DEFINES["USE_X11"] = "1"
>++
>+ Library("video_capture_internal_impl_gn")
>+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 145e54928644..d53c45076c66 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -61876,7 +62520,7 @@ index b9784482e9bd..d6db6b79cea3 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -61924,6 +62568,10 @@ index b9784482e9bd..d6db6b79cea3 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -62067,11 +62715,11 @@ index b9784482e9bd..d6db6b79cea3 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("av1_svc_config_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 a086f7cb0b6f..6b870ee54300 100644
>---- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
>+ 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 065cf604b5d3..e9eebffdbcd2 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62094,7 +62742,7 @@ index a086f7cb0b6f..6b870ee54300 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -62142,10 +62790,6 @@ index a086f7cb0b6f..6b870ee54300 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -62289,11 +62933,11 @@ index a086f7cb0b6f..6b870ee54300 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("encoded_frame_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 e8fdf3750a0c..a7f10d9ed7a9 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
>+ 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 53a7fc384c3d..bd7362a67f30 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62316,7 +62960,7 @@ index e8fdf3750a0c..a7f10d9ed7a9 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -62404,13 +63048,6 @@ index e8fdf3750a0c..a7f10d9ed7a9 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -62420,10 +63057,6 @@ index e8fdf3750a0c..a7f10d9ed7a9 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -62440,12 +63073,10 @@ index e8fdf3750a0c..a7f10d9ed7a9 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -62467,21 +63098,16 @@ index e8fdf3750a0c..a7f10d9ed7a9 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -62491,27 +63117,18 @@ index e8fdf3750a0c..a7f10d9ed7a9 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 ecd9c1dd8d37..864af3b1dda1 100644
>---- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
>+-
>+ 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 b9784482e9bd..d6db6b79cea3 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62725,11 +63342,11 @@ index ecd9c1dd8d37..864af3b1dda1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("frame_helpers_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 b92c2ed52823..0573b18d11d4 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
>+ Library("av1_svc_config_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 a086f7cb0b6f..6b870ee54300 100644
>+--- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62752,7 +63369,7 @@ index b92c2ed52823..0573b18d11d4 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -62800,6 +63417,10 @@ index b92c2ed52823..0573b18d11d4 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -62943,11 +63564,11 @@ index b92c2ed52823..0573b18d11d4 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 92267a7c583f..98e803b7c4c1 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
>+ Library("encoded_frame_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 e8fdf3750a0c..a7f10d9ed7a9 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62970,7 +63591,7 @@ index 92267a7c583f..98e803b7c4c1 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -63018,10 +63639,6 @@ index 92267a7c583f..98e803b7c4c1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -63165,11 +63782,11 @@ index 92267a7c583f..98e803b7c4c1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 187cf6089c53..45337d14f78e 100644
>---- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
>+ 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 ecd9c1dd8d37..864af3b1dda1 100644
>+--- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63192,7 +63809,7 @@ index 187cf6089c53..45337d14f78e 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -63240,10 +63857,6 @@ index 187cf6089c53..45337d14f78e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -63387,11 +64000,11 @@ index 187cf6089c53..45337d14f78e 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 09929b1d482a..f3d5f329d665 100644
>---- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
>+ Library("frame_helpers_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 b92c2ed52823..0573b18d11d4 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63414,7 +64027,7 @@ index 09929b1d482a..f3d5f329d665 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -63462,10 +64075,6 @@ index 09929b1d482a..f3d5f329d665 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -63609,11 +64218,11 @@ index 09929b1d482a..f3d5f329d665 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 698684346412..da2c255ee0fc 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
>+ 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 92267a7c583f..98e803b7c4c1 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63636,7 +64245,7 @@ index 698684346412..da2c255ee0fc 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -63684,6 +64293,10 @@ index 698684346412..da2c255ee0fc 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -63827,11 +64440,11 @@ index 698684346412..da2c255ee0fc 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 88f469760f7f..e0bfc360efea 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
>+ 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 187cf6089c53..45337d14f78e 100644
>+--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63854,7 +64467,7 @@ index 88f469760f7f..e0bfc360efea 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -50,185 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -63902,6 +64515,10 @@ index 88f469760f7f..e0bfc360efea 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -64045,11 +64662,11 @@ index 88f469760f7f..e0bfc360efea 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 d09a4aed3ab5..8d6c549ef978 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
>+ 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 09929b1d482a..f3d5f329d665 100644
>+--- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64072,7 +64689,7 @@ index d09a4aed3ab5..8d6c549ef978 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -64120,6 +64737,10 @@ index d09a4aed3ab5..8d6c549ef978 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -64160,6 +64781,13 @@ index d09a4aed3ab5..8d6c549ef978 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -64256,11 +64884,11 @@ index d09a4aed3ab5..8d6c549ef978 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("scalable_video_controller_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 2bd3634ba957..a7a401eb155d 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
>+ 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 698684346412..da2c255ee0fc 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64474,11 +65102,11 @@ index 2bd3634ba957..a7a401eb155d 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 9c48932149b9..8bbe558a2477 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
>+ 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 88f469760f7f..e0bfc360efea 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64501,7 +65129,7 @@ index 9c48932149b9..8bbe558a2477 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -50,185 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -64589,6 +65217,13 @@ index 9c48932149b9..8bbe558a2477 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -64685,11 +65320,11 @@ index 9c48932149b9..8bbe558a2477 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 0e5991cffd44..8c91c74e87f1 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
>+ 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 d09a4aed3ab5..8d6c549ef978 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64896,11 +65531,11 @@ index 0e5991cffd44..8c91c74e87f1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 a311c4a8024c..72c2e8f95f30 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
>+ Library("scalable_video_controller_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 2bd3634ba957..a7a401eb155d 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64923,7 +65558,7 @@ index a311c4a8024c..72c2e8f95f30 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -65011,6 +65646,13 @@ index a311c4a8024c..72c2e8f95f30 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -65107,11 +65749,11 @@ index a311c4a8024c..72c2e8f95f30 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 6d87c74bd732..42312fbebab1 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
>+ 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 9c48932149b9..8bbe558a2477 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65134,7 +65776,7 @@ index 6d87c74bd732..42312fbebab1 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -65182,10 +65824,6 @@ index 6d87c74bd732..42312fbebab1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -65226,13 +65864,6 @@ index 6d87c74bd732..42312fbebab1 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -65329,11 +65960,11 @@ index 6d87c74bd732..42312fbebab1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 e05eebc11f52..362ec70ca4a8 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
>+ 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 0e5991cffd44..8c91c74e87f1 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65540,11 +66171,11 @@ index e05eebc11f52..362ec70ca4a8 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 10e36ea24cf2..f02054e9631b 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
>+ 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 a311c4a8024c..72c2e8f95f30 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65751,11 +66382,11 @@ index 10e36ea24cf2..f02054e9631b 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 2ab95ef62991..4f51ffc604ee 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
>+ 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 6d87c74bd732..42312fbebab1 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65973,11 +66604,11 @@ index 2ab95ef62991..4f51ffc604ee 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 0e18b1aecaed..838e14e931d2 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
>+ 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 e05eebc11f52..362ec70ca4a8 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66000,7 +66631,7 @@ index 0e18b1aecaed..838e14e931d2 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -66088,13 +66719,6 @@ index 0e18b1aecaed..838e14e931d2 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -66191,11 +66815,11 @@ index 0e18b1aecaed..838e14e931d2 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 01a6429d0cdf..9e61bd48387a 100644
>---- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
>+ 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 10e36ea24cf2..f02054e9631b 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66218,7 +66842,7 @@ index 01a6429d0cdf..9e61bd48387a 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -56,190 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -66238,7 +66862,6 @@ index 01a6429d0cdf..9e61bd48387a 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -66267,10 +66890,6 @@ index 01a6429d0cdf..9e61bd48387a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -66311,13 +66930,6 @@ index 01a6429d0cdf..9e61bd48387a 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -66414,11 +67026,11 @@ index 01a6429d0cdf..9e61bd48387a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 75698c304f78..89bf22a8c48f 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
>+ 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 2ab95ef62991..4f51ffc604ee 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66441,7 +67053,7 @@ index 75698c304f78..89bf22a8c48f 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -54,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -66461,7 +67073,6 @@ index 75698c304f78..89bf22a8c48f 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -66637,12 +67248,12 @@ index 75698c304f78..89bf22a8c48f 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("video_coding_utility_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 ce59cc861c99..d9cbac447de8 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
>-@@ -15,11 +15,21 @@ AllowCompilerWarnings()
>+ 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 0e18b1aecaed..838e14e931d2 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
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -66664,7 +67275,7 @@ index ce59cc861c99..d9cbac447de8 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -46,178 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -66752,6 +67363,13 @@ index ce59cc861c99..d9cbac447de8 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -66848,12 +67466,12 @@ index ce59cc861c99..d9cbac447de8 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 352458cf8e21..965ef96422be 100644
>---- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>-@@ -15,11 +15,21 @@ AllowCompilerWarnings()
>+ 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 01a6429d0cdf..9e61bd48387a 100644
>+--- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -66875,7 +67493,7 @@ index 352458cf8e21..965ef96422be 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -49,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -56,190 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -67071,11 +67689,11 @@ index 352458cf8e21..965ef96422be 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 0338ba659e01..f1da16b805a7 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
>+ 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 75698c304f78..89bf22a8c48f 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67098,7 +67716,7 @@ index 0338ba659e01..f1da16b805a7 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -54,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -67118,6 +67736,7 @@ index 0338ba659e01..f1da16b805a7 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -67145,222 +67764,10 @@ index 0338ba659e01..f1da16b805a7 100644
> -    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["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["TARGET_CPU"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>--
>--    OS_LIBS += [
>--        "unwind"
>--    ]
>--
>--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":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 d7ae0d5805b3..9ebd70792c7b 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
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- 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"
>- 
>-@@ -48,190 +58,32 @@ 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"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    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_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
>--
>--    OS_LIBS += [
>--        "rt"
>--    ]
>+-
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
>@@ -67505,11 +67912,11 @@ index d7ae0d5805b3..9ebd70792c7b 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 c0d16a8e5163..1cf6175508db 100644
>---- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>+ Library("video_coding_utility_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 ce59cc861c99..d9cbac447de8 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
> @@ -15,11 +15,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67532,7 +67939,7 @@ index c0d16a8e5163..1cf6175508db 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -51,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,178 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -67552,7 +67959,6 @@ index c0d16a8e5163..1cf6175508db 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -67581,10 +67987,6 @@ index c0d16a8e5163..1cf6175508db 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -67625,13 +68027,6 @@ index c0d16a8e5163..1cf6175508db 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -67728,12 +68123,12 @@ index c0d16a8e5163..1cf6175508db 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 6abd453136c9..c0f5ab3b81ef 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
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ 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 352458cf8e21..965ef96422be 100644
>+--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>+@@ -15,11 +15,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -67755,7 +68150,7 @@ index 6abd453136c9..c0f5ab3b81ef 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -49,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -67775,6 +68170,7 @@ index 6abd453136c9..c0f5ab3b81ef 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -67803,6 +68199,10 @@ index 6abd453136c9..c0f5ab3b81ef 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -67946,266 +68346,11 @@ index 6abd453136c9..c0f5ab3b81ef 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("webrtc_vp9_helpers_gn")
>-diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
>-index b047107d3dc7..64d5359f0f0c 100644
>---- third_party/libwebrtc/moz.build
>-+++ third_party/libwebrtc/moz.build
>-@@ -273,6 +273,8 @@ DIRS += [
>-     "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
>-     "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
>-     "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
>-+    "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>-+    "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>-     "/third_party/libwebrtc/modules/module_api_gn",
>-     "/third_party/libwebrtc/modules/module_api_public_gn",
>-     "/third_party/libwebrtc/modules/module_fec_api_gn",
>-@@ -473,102 +475,11 @@ DIRS += [
>-     "/third_party/libwebrtc/webrtc_gn"
>- ]
>- 
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/rtc_base/ifaddrs_android_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn",
>--        "/third_party/libwebrtc/rtc_base/system/gcd_helpers_gn",
>--        "/third_party/libwebrtc/sdk/base_objc_gn",
>--        "/third_party/libwebrtc/sdk/helpers_objc_gn",
>--        "/third_party/libwebrtc/sdk/videocapture_objc_gn",
>--        "/third_party/libwebrtc/sdk/videoframebuffer_objc_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn",
>--        "/third_party/libwebrtc/rtc_base/win/get_activation_factory_gn",
>--        "/third_party/libwebrtc/rtc_base/win/hstring_gn",
>--        "/third_party/libwebrtc/rtc_base/win/windows_version_gn",
>--        "/third_party/libwebrtc/rtc_base/win32_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "aarch64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "aarch64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/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"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>-+if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "aarch64":
>- 
>-     DIRS += [
>-         "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>-         "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>-         "/third_party/libwebrtc/modules/portal/portal_gn",
>-         "/third_party/libwebrtc/third_party/drm/drm_gn",
>-         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>-@@ -576,26 +487,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>-         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>-     ]
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
>-+if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "mips32":
>- 
>-     DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/modules/portal/portal_gn",
>--        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn",
>--        "/third_party/libwebrtc/third_party/drm/drm_gn",
>--        "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>--        "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
>--        "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>-         "/third_party/libwebrtc/modules/portal/portal_gn",
>-         "/third_party/libwebrtc/third_party/drm/drm_gn",
>-         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>-@@ -603,11 +497,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
>-         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>-     ]
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
>-+if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "mips64":
>- 
>-     DIRS += [
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>-         "/third_party/libwebrtc/modules/portal/portal_gn",
>-         "/third_party/libwebrtc/third_party/drm/drm_gn",
>-         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>-@@ -615,7 +507,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
>-         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>-     ]
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "x86":
>- 
>-     DIRS += [
>-         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>-@@ -623,8 +515,6 @@ 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",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>-         "/third_party/libwebrtc/modules/portal/portal_gn",
>-         "/third_party/libwebrtc/third_party/drm/drm_gn",
>-         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>-@@ -632,7 +522,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>-     ]
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DIRS += [
>-         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>-@@ -640,69 +530,9 @@ 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",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>-         "/third_party/libwebrtc/modules/portal/portal_gn",
>-         "/third_party/libwebrtc/third_party/drm/drm_gn",
>-         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>-         "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
>-         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>-     ]
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "aarch64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/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"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/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"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/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"
>--    ]
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "ppc64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
>--    ]
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_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 415f09cfd1fe..de5b867157f4 100644
>---- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
>+ 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 0338ba659e01..f1da16b805a7 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68228,7 +68373,7 @@ index 415f09cfd1fe..de5b867157f4 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68248,7 +68393,6 @@ index 415f09cfd1fe..de5b867157f4 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -68317,13 +68461,6 @@ index 415f09cfd1fe..de5b867157f4 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -68420,11 +68557,11 @@ index 415f09cfd1fe..de5b867157f4 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 9f3ce4d4b600..fb11aa9b0f1c 100644
>---- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
>+ 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 d7ae0d5805b3..9ebd70792c7b 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68447,7 +68584,7 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -48,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68466,6 +68603,11 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -68491,6 +68633,10 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -68531,6 +68677,13 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -68540,6 +68693,10 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -68556,10 +68713,12 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -68581,16 +68740,21 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -68600,19 +68764,28 @@ index 9f3ce4d4b600..fb11aa9b0f1c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("async_packet_socket_gn")
>-diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
>-index 70a2aa730b19..27f099ef7b90 100644
>---- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 c0d16a8e5163..1cf6175508db 100644
>+--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>+@@ -15,11 +15,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -68634,7 +68807,7 @@ index 70a2aa730b19..27f099ef7b90 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -51,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68654,6 +68827,7 @@ index 70a2aa730b19..27f099ef7b90 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -68682,6 +68856,10 @@ index 70a2aa730b19..27f099ef7b90 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -68825,11 +69003,11 @@ index 70a2aa730b19..27f099ef7b90 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("audio_format_to_string_gn")
>-diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
>-index 3dfd3b19d24b..933e5434bf8c 100644
>---- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
>+ 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 6abd453136c9..c0f5ab3b81ef 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68852,7 +69030,7 @@ index 3dfd3b19d24b..933e5434bf8c 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68940,6 +69118,13 @@ index 3dfd3b19d24b..933e5434bf8c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -69036,11 +69221,266 @@ index 3dfd3b19d24b..933e5434bf8c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 7b1ba50f99cf..b05e27ad3426 100644
>---- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
>+ Library("webrtc_vp9_helpers_gn")
>+diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
>+index be3997a5c6c4..a7a18e6099ab 100644
>+--- third_party/libwebrtc/moz.build
>++++ third_party/libwebrtc/moz.build
>+@@ -275,6 +275,8 @@ DIRS += [
>+     "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
>+     "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
>+     "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
>++    "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>++    "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+     "/third_party/libwebrtc/modules/module_api_gn",
>+     "/third_party/libwebrtc/modules/module_api_public_gn",
>+     "/third_party/libwebrtc/modules/module_fec_api_gn",
>+@@ -477,102 +479,11 @@ DIRS += [
>+     "/third_party/libwebrtc/webrtc_gn"
>+ ]
>+ 
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/rtc_base/ifaddrs_android_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn",
>+-        "/third_party/libwebrtc/rtc_base/system/gcd_helpers_gn",
>+-        "/third_party/libwebrtc/sdk/base_objc_gn",
>+-        "/third_party/libwebrtc/sdk/helpers_objc_gn",
>+-        "/third_party/libwebrtc/sdk/videocapture_objc_gn",
>+-        "/third_party/libwebrtc/sdk/videoframebuffer_objc_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/get_activation_factory_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/hstring_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/windows_version_gn",
>+-        "/third_party/libwebrtc/rtc_base/win32_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "aarch64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86_64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "aarch64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin" and CONFIG["TARGET_CPU"] == "x86_64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/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"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>++if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DIRS += [
>+         "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+         "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+         "/third_party/libwebrtc/modules/portal/portal_gn",
>+         "/third_party/libwebrtc/third_party/drm/drm_gn",
>+         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>+@@ -580,26 +491,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
>+         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>+     ]
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
>++if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "mips32":
>+ 
>+     DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/modules/portal/portal_gn",
>+-        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn",
>+-        "/third_party/libwebrtc/third_party/drm/drm_gn",
>+-        "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>+-        "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
>+-        "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+         "/third_party/libwebrtc/modules/portal/portal_gn",
>+         "/third_party/libwebrtc/third_party/drm/drm_gn",
>+         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>+@@ -607,11 +501,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
>+         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>+     ]
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
>++if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "mips64":
>+ 
>+     DIRS += [
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+         "/third_party/libwebrtc/modules/portal/portal_gn",
>+         "/third_party/libwebrtc/third_party/drm/drm_gn",
>+         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>+@@ -619,7 +511,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
>+         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>+     ]
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>++if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "x86":
>+ 
>+     DIRS += [
>+         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+@@ -627,8 +519,6 @@ 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",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+         "/third_party/libwebrtc/modules/portal/portal_gn",
>+         "/third_party/libwebrtc/third_party/drm/drm_gn",
>+         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>+@@ -636,7 +526,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>+         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>+     ]
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>++if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DIRS += [
>+         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+@@ -644,69 +534,9 @@ 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",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+         "/third_party/libwebrtc/modules/portal/portal_gn",
>+         "/third_party/libwebrtc/third_party/drm/drm_gn",
>+         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
>+         "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
>+         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
>+     ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "aarch64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "x86_64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/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"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/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"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "x86_64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/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"
>+-    ]
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "ppc64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
>+-    ]
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_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 415f09cfd1fe..de5b867157f4 100644
>+--- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69063,7 +69503,7 @@ index 7b1ba50f99cf..b05e27ad3426 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69083,6 +69523,7 @@ index 7b1ba50f99cf..b05e27ad3426 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -69254,11 +69695,11 @@ index 7b1ba50f99cf..b05e27ad3426 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 c82c4c9965bf..36b9f5b6c119 100644
>---- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
>+ 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 9f3ce4d4b600..fb11aa9b0f1c 100644
>+--- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69281,7 +69722,7 @@ index c82c4c9965bf..36b9f5b6c119 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69300,10 +69741,6 @@ index c82c4c9965bf..36b9f5b6c119 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -69378,10 +69815,6 @@ index c82c4c9965bf..36b9f5b6c119 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -69398,12 +69831,10 @@ index c82c4c9965bf..36b9f5b6c119 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -69425,21 +69856,16 @@ index c82c4c9965bf..36b9f5b6c119 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -69449,27 +69875,18 @@ index c82c4c9965bf..36b9f5b6c119 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 5e5d11ff6f7e..fa3cb7950b6c 100644
>---- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
>+-
>+ Library("async_packet_socket_gn")
>+diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
>+index 70a2aa730b19..27f099ef7b90 100644
>+--- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69492,7 +69909,7 @@ index 5e5d11ff6f7e..fa3cb7950b6c 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69580,6 +69997,13 @@ index 5e5d11ff6f7e..fa3cb7950b6c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -69589,6 +70013,10 @@ index 5e5d11ff6f7e..fa3cb7950b6c 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -69605,10 +70033,12 @@ index 5e5d11ff6f7e..fa3cb7950b6c 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -69630,16 +70060,21 @@ index 5e5d11ff6f7e..fa3cb7950b6c 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -69649,18 +70084,27 @@ index 5e5d11ff6f7e..fa3cb7950b6c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 89a2c9e84e1c..01e755bb6f7c 100644
>---- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ Library("audio_format_to_string_gn")
>+diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
>+index 3dfd3b19d24b..933e5434bf8c 100644
>+--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69867,11 +70311,11 @@ index 89a2c9e84e1c..01e755bb6f7c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 b95d149625ed..4ed69f91caf9 100644
>---- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
>+ 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 7b1ba50f99cf..b05e27ad3426 100644
>+--- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69894,7 +70338,7 @@ index b95d149625ed..4ed69f91caf9 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69913,6 +70357,10 @@ index b95d149625ed..4ed69f91caf9 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -69978,6 +70426,13 @@ index b95d149625ed..4ed69f91caf9 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -69987,6 +70442,10 @@ index b95d149625ed..4ed69f91caf9 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -70003,10 +70462,12 @@ index b95d149625ed..4ed69f91caf9 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -70028,16 +70489,21 @@ index b95d149625ed..4ed69f91caf9 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -70047,18 +70513,27 @@ index b95d149625ed..4ed69f91caf9 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("byte_order_gn")
>-diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
>-index f147bdc64bd9..477bb6cf012e 100644
>---- third_party/libwebrtc/rtc_base/checks_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 c82c4c9965bf..36b9f5b6c119 100644
>+--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70265,11 +70740,11 @@ index f147bdc64bd9..477bb6cf012e 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 711466336e15..80475fdc6a41 100644
>---- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
>+ 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 5e5d11ff6f7e..fa3cb7950b6c 100644
>+--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70292,7 +70767,7 @@ index 711466336e15..80475fdc6a41 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70311,6 +70786,10 @@ index 711466336e15..80475fdc6a41 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -70401,7 +70880,7 @@ index 711466336e15..80475fdc6a41 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>  
>      DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>@@ -70452,11 +70931,11 @@ index 711466336e15..80475fdc6a41 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 fa4fdc873993..7c49ec6a5edd 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
>+ 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 89a2c9e84e1c..01e755bb6f7c 100644
>+--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70663,11 +71142,11 @@ index fa4fdc873993..7c49ec6a5edd 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 7c9b3edd1676..95a2855408fd 100644
>---- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
>+ 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 b95d149625ed..4ed69f91caf9 100644
>+--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70690,7 +71169,7 @@ index 7c9b3edd1676..95a2855408fd 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70709,10 +71188,6 @@ index 7c9b3edd1676..95a2855408fd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -70803,7 +71278,7 @@ index 7c9b3edd1676..95a2855408fd 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>  
>      DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>@@ -70854,11 +71329,11 @@ index 7c9b3edd1676..95a2855408fd 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 02d364fe30a5..a7902a51d2f6 100644
>---- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
>+ Library("byte_order_gn")
>+diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
>+index f147bdc64bd9..477bb6cf012e 100644
>+--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70881,7 +71356,7 @@ index 02d364fe30a5..a7902a51d2f6 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70978,6 +71453,10 @@ index 02d364fe30a5..a7902a51d2f6 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -70994,10 +71473,12 @@ index 02d364fe30a5..a7902a51d2f6 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -71019,16 +71500,21 @@ index 02d364fe30a5..a7902a51d2f6 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -71038,18 +71524,27 @@ index 02d364fe30a5..a7902a51d2f6 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 dd687b90f3ff..8ed0bc7ee1af 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
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 711466336e15..80475fdc6a41 100644
>+--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71072,7 +71567,7 @@ index dd687b90f3ff..8ed0bc7ee1af 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71091,10 +71586,6 @@ index dd687b90f3ff..8ed0bc7ee1af 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -71169,10 +71660,6 @@ index dd687b90f3ff..8ed0bc7ee1af 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -71189,12 +71676,10 @@ index dd687b90f3ff..8ed0bc7ee1af 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -71216,21 +71701,16 @@ index dd687b90f3ff..8ed0bc7ee1af 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -71240,27 +71720,18 @@ index dd687b90f3ff..8ed0bc7ee1af 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- Library("copy_on_write_buffer_gn")
>-diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>-index d860667eb591..f09bb05f3fda 100644
>---- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>+-
>+ 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 fa4fdc873993..7c49ec6a5edd 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71467,11 +71938,11 @@ index d860667eb591..f09bb05f3fda 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("criticalsection_gn")
>-diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
>-index 5946a30db45f..1212206025b7 100644
>---- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
>+ 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 7c9b3edd1676..95a2855408fd 100644
>+--- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71658,11 +72129,11 @@ index 5946a30db45f..1212206025b7 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 fd82b23b98e3..e83d2e34dc26 100644
>---- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
>+ 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 02d364fe30a5..a7902a51d2f6 100644
>+--- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71685,7 +72156,7 @@ index fd82b23b98e3..e83d2e34dc26 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71704,6 +72175,10 @@ index fd82b23b98e3..e83d2e34dc26 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -71794,7 +72269,7 @@ index fd82b23b98e3..e83d2e34dc26 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>  
>      DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>@@ -71845,11 +72320,11 @@ index fd82b23b98e3..e83d2e34dc26 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 2ea470772f4b..1235e95439b9 100644
>---- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
>+ 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 dd687b90f3ff..8ed0bc7ee1af 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71872,7 +72347,7 @@ index 2ea470772f4b..1235e95439b9 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71960,13 +72435,6 @@ index 2ea470772f4b..1235e95439b9 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -72063,11 +72531,11 @@ index 2ea470772f4b..1235e95439b9 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 09174a3a20ab..f906bc9cd246 100644
>---- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
>+ Library("copy_on_write_buffer_gn")
>+diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>+index d860667eb591..f09bb05f3fda 100644
>+--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72090,7 +72558,7 @@ index 09174a3a20ab..f906bc9cd246 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72178,13 +72646,6 @@ index 09174a3a20ab..f906bc9cd246 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -72281,11 +72742,11 @@ index 09174a3a20ab..f906bc9cd246 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 233c203847c4..0142ed0457e9 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
>+ Library("criticalsection_gn")
>+diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
>+index 5946a30db45f..1212206025b7 100644
>+--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72308,7 +72769,7 @@ index 233c203847c4..0142ed0457e9 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72396,13 +72857,6 @@ index 233c203847c4..0142ed0457e9 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -72412,10 +72866,6 @@ index 233c203847c4..0142ed0457e9 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -72432,12 +72882,10 @@ index 233c203847c4..0142ed0457e9 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -72459,21 +72907,16 @@ index 233c203847c4..0142ed0457e9 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -72483,27 +72926,18 @@ index 233c203847c4..0142ed0457e9 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- Library("balanced_degradation_settings_gn")
>-diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
>-index e8ae0afef0a3..a46ef7998d57 100644
>---- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
>+-
>+ 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 fd82b23b98e3..e83d2e34dc26 100644
>+--- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72526,7 +72960,7 @@ index e8ae0afef0a3..a46ef7998d57 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72545,10 +72979,6 @@ index e8ae0afef0a3..a46ef7998d57 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -72614,13 +73044,6 @@ index e8ae0afef0a3..a46ef7998d57 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -72630,10 +73053,6 @@ index e8ae0afef0a3..a46ef7998d57 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -72650,12 +73069,10 @@ index e8ae0afef0a3..a46ef7998d57 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -72677,21 +73094,16 @@ index e8ae0afef0a3..a46ef7998d57 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -72701,27 +73113,18 @@ index e8ae0afef0a3..a46ef7998d57 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- Library("bandwidth_quality_scaler_settings_gn")
>-diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
>-index 00af297d92c7..cfa672be2411 100644
>---- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
>+-
>+ 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 2ea470772f4b..1235e95439b9 100644
>+--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72935,11 +73338,11 @@ index 00af297d92c7..cfa672be2411 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("cpu_speed_experiment_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 9866a74964c7..a09edc6dce96 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
>+ 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 09174a3a20ab..f906bc9cd246 100644
>+--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73153,11 +73556,11 @@ index 9866a74964c7..a09edc6dce96 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("encoder_info_settings_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 520c4db65a2b..00eca302cf45 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
>+ 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 233c203847c4..0142ed0457e9 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73180,7 +73583,7 @@ index 520c4db65a2b..00eca302cf45 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -73371,11 +73774,11 @@ index 520c4db65a2b..00eca302cf45 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 397f0dd3ce6f..42e0bfc0b541 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
>+ Library("balanced_degradation_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 9866a74964c7..a09edc6dce96 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73589,11 +73992,11 @@ index 397f0dd3ce6f..42e0bfc0b541 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 5cd3bb4a2bf0..09ebf5322ea7 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
>+ Library("encoder_info_settings_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 520c4db65a2b..00eca302cf45 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73616,7 +74019,7 @@ index 5cd3bb4a2bf0..09ebf5322ea7 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -73807,11 +74210,11 @@ index 5cd3bb4a2bf0..09ebf5322ea7 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 9c3e585bf972..89f9af863d4a 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
>+ 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 397f0dd3ce6f..42e0bfc0b541 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74025,11 +74428,11 @@ index 9c3e585bf972..89f9af863d4a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("normalize_simulcast_size_experiment_gn")
>-diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
>-index a03ad630cd73..a008cbfdd569 100644
>---- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
>+ 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 5cd3bb4a2bf0..09ebf5322ea7 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74243,11 +74646,11 @@ index a03ad630cd73..a008cbfdd569 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("quality_rampup_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 d1b4330a18db..de18961b8154 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
>+ 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 9c3e585bf972..89f9af863d4a 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74461,11 +74864,11 @@ index d1b4330a18db..de18961b8154 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 8e75fbc3b032..79fc2e93ba33 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
>+ Library("normalize_simulcast_size_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 d1b4330a18db..de18961b8154 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74679,11 +75082,11 @@ index 8e75fbc3b032..79fc2e93ba33 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 0051ac37f9e8..fe9271425d64 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
>+ 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 8e75fbc3b032..79fc2e93ba33 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74897,11 +75300,11 @@ index 0051ac37f9e8..fe9271425d64 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("rate_control_settings_gn")
>-diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
>-index 2c239310fc08..5e98394eef8b 100644
>---- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
>+ 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 0051ac37f9e8..fe9271425d64 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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75115,11 +75518,11 @@ index 2c239310fc08..5e98394eef8b 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("stable_target_rate_experiment_gn")
>-diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
>-index 87a5e335eb06..ba58d3df2494 100644
>---- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
>+ Library("rate_control_settings_gn")
>+diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
>+index 2c239310fc08..5e98394eef8b 100644
>+--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75333,11 +75736,11 @@ index 87a5e335eb06..ba58d3df2494 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 03bb1071f60c..6e5808f68281 100644
>---- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
>+ Library("stable_target_rate_experiment_gn")
>+diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
>+index 87a5e335eb06..ba58d3df2494 100644
>+--- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75360,7 +75763,7 @@ index 03bb1071f60c..6e5808f68281 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75379,6 +75782,10 @@ index 03bb1071f60c..6e5808f68281 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -75444,6 +75851,13 @@ index 03bb1071f60c..6e5808f68281 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -75453,6 +75867,10 @@ index 03bb1071f60c..6e5808f68281 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -75469,10 +75887,12 @@ index 03bb1071f60c..6e5808f68281 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -75494,16 +75914,21 @@ index 03bb1071f60c..6e5808f68281 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -75513,18 +75938,27 @@ index 03bb1071f60c..6e5808f68281 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 3f7a2c1ffa1f..042fc6088182 100644
>---- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 03bb1071f60c..6e5808f68281 100644
>+--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75547,7 +75981,7 @@ index 3f7a2c1ffa1f..042fc6088182 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75566,10 +76000,6 @@ index 3f7a2c1ffa1f..042fc6088182 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -75644,10 +76074,6 @@ index 3f7a2c1ffa1f..042fc6088182 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -75664,12 +76090,10 @@ index 3f7a2c1ffa1f..042fc6088182 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -75691,21 +76115,16 @@ index 3f7a2c1ffa1f..042fc6088182 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -75715,128 +76134,18 @@ index 3f7a2c1ffa1f..042fc6088182 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 d89873bf7483..000000000000
>---- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
>-+++ /dev/null
>-@@ -1,95 +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/.
>--
> -
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["ANDROID"] = True
>--DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--DEFINES["HAVE_SYS_UIO_H"] = True
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["WEBRTC_ANDROID"] = True
>--DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>--DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>--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["_GNU_SOURCE"] = True
>--DEFINES["__STDC_CONSTANT_MACROS"] = True
>--DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--FINAL_LIBRARY = "xul"
>--
>--
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "!/third_party/libwebrtc/gen",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>--
>--OS_LIBS += [
>--    "GLESv2",
>--    "log"
>--]
>--
>--UNIFIED_SOURCES += [
>--    "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["TARGET_CPU"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--if CONFIG["TARGET_CPU"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--    OS_LIBS += [
>--        "unwind"
>--    ]
>--
>--if CONFIG["TARGET_CPU"] == "x86":
>--
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["TARGET_CPU"] == "x86_64":
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--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 06009fc8668e..4f9eacbcf8a7 100644
>---- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
>+ 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 3f7a2c1ffa1f..042fc6088182 100644
>+--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75859,7 +76168,7 @@ index 06009fc8668e..4f9eacbcf8a7 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75878,6 +76187,10 @@ index 06009fc8668e..4f9eacbcf8a7 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -75952,6 +76265,10 @@ index 06009fc8668e..4f9eacbcf8a7 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -75968,10 +76285,12 @@ index 06009fc8668e..4f9eacbcf8a7 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -75993,16 +76312,21 @@ index 06009fc8668e..4f9eacbcf8a7 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -76012,18 +76336,128 @@ index 06009fc8668e..4f9eacbcf8a7 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 d89873bf7483..000000000000
>+--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
>++++ /dev/null
>+@@ -1,95 +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/.
> -
>- 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 c2f9eb412bca..df8f9503cb8a 100644
>---- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
>+-
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
>+-
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
>+-
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["ANDROID"] = True
>+-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-DEFINES["HAVE_SYS_UIO_H"] = True
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["WEBRTC_ANDROID"] = True
>+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+-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["_GNU_SOURCE"] = True
>+-DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-FINAL_LIBRARY = "xul"
>+-
>+-
>+-LOCAL_INCLUDES += [
>+-    "!/ipc/ipdl/_ipdlheaders",
>+-    "!/third_party/libwebrtc/gen",
>+-    "/ipc/chromium/src",
>+-    "/third_party/libwebrtc/",
>+-    "/third_party/libwebrtc/third_party/abseil-cpp/",
>+-    "/tools/profiler/public"
>+-]
>+-
>+-OS_LIBS += [
>+-    "GLESv2",
>+-    "log"
>+-]
>+-
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc"
>+-]
>+-
>+-if not CONFIG["MOZ_DEBUG"]:
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1":
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["TARGET_CPU"] == "aarch64":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["TARGET_CPU"] == "x86":
>+-
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-
>+-if CONFIG["TARGET_CPU"] == "x86_64":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-
>+-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 06009fc8668e..4f9eacbcf8a7 100644
>+--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76046,7 +76480,7 @@ index c2f9eb412bca..df8f9503cb8a 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76065,11 +76499,6 @@ index c2f9eb412bca..df8f9503cb8a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -76135,12 +76564,6 @@ index c2f9eb412bca..df8f9503cb8a 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -76150,10 +76573,6 @@ index c2f9eb412bca..df8f9503cb8a 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -76170,12 +76589,10 @@ index c2f9eb412bca..df8f9503cb8a 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -76197,21 +76614,16 @@ index c2f9eb412bca..df8f9503cb8a 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -76221,34 +76633,24 @@ index c2f9eb412bca..df8f9503cb8a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 2b47ed986c72..191af40a1a3f 100644
>---- third_party/libwebrtc/rtc_base/logging_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
>-@@ -12,12 +12,22 @@ AllowCompilerWarnings()
>+-
>+ 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 c2f9eb412bca..df8f9503cb8a 100644
>+--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  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_ENABLE_LIBEVENT"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>@@ -76265,7 +76667,7 @@ index 2b47ed986c72..191af40a1a3f 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76285,6 +76687,7 @@ index 2b47ed986c72..191af40a1a3f 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -76357,8 +76760,7 @@ index 2b47ed986c72..191af40a1a3f 100644
> -    OS_LIBS += [
> -        "crypt32",
> -        "iphlpapi",
>--        "secur32",
>--        "winmm"
>+-        "secur32"
> -    ]
> +    DEFINES["_DEBUG"] = True
>  
>@@ -76456,17 +76858,18 @@ index 2b47ed986c72..191af40a1a3f 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("logging_gn")
>-diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>-index 7a54f6369568..ae2eb48d37a1 100644
>---- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ 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 2b47ed986c72..191af40a1a3f 100644
>+--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
>+@@ -12,12 +12,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  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_ENABLE_LIBEVENT"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>@@ -76483,7 +76886,7 @@ index 7a54f6369568..ae2eb48d37a1 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76502,6 +76905,10 @@ index 7a54f6369568..ae2eb48d37a1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -76567,6 +76974,13 @@ index 7a54f6369568..ae2eb48d37a1 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -76576,6 +76990,10 @@ index 7a54f6369568..ae2eb48d37a1 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -76592,10 +77010,12 @@ index 7a54f6369568..ae2eb48d37a1 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -76617,16 +77037,21 @@ index 7a54f6369568..ae2eb48d37a1 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -76636,18 +77061,27 @@ index 7a54f6369568..ae2eb48d37a1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 06a17077bb82..21d3404240cd 100644
>---- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ Library("logging_gn")
>+diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>+index 7a54f6369568..ae2eb48d37a1 100644
>+--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76670,7 +77104,7 @@ index 06a17077bb82..21d3404240cd 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76689,10 +77123,6 @@ index 06a17077bb82..21d3404240cd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -76767,10 +77197,6 @@ index 06a17077bb82..21d3404240cd 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -76787,12 +77213,10 @@ index 06a17077bb82..21d3404240cd 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -76814,21 +77238,16 @@ index 06a17077bb82..21d3404240cd 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -76838,27 +77257,18 @@ index 06a17077bb82..21d3404240cd 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 ea25143a15aa..da34908795f0 100644
>---- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
>+-
>+ 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 06a17077bb82..21d3404240cd 100644
>+--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76881,7 +77291,7 @@ index ea25143a15aa..da34908795f0 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76978,6 +77388,10 @@ index ea25143a15aa..da34908795f0 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -76994,10 +77408,12 @@ index ea25143a15aa..da34908795f0 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -77019,16 +77435,21 @@ index ea25143a15aa..da34908795f0 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -77038,18 +77459,27 @@ index ea25143a15aa..da34908795f0 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 967e6e28ba29..60644d006ab2 100644
>---- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 ea25143a15aa..da34908795f0 100644
>+--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77236,11 +77666,11 @@ index 967e6e28ba29..60644d006ab2 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 7c0cfcf806a7..2b89135329e6 100644
>---- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
>+ 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 967e6e28ba29..60644d006ab2 100644
>+--- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77263,7 +77693,7 @@ index 7c0cfcf806a7..2b89135329e6 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -77283,7 +77713,6 @@ index 7c0cfcf806a7..2b89135329e6 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -77352,12 +77781,6 @@ index 7c0cfcf806a7..2b89135329e6 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -77367,10 +77790,6 @@ index 7c0cfcf806a7..2b89135329e6 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -77387,12 +77806,10 @@ index 7c0cfcf806a7..2b89135329e6 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -77414,21 +77831,16 @@ index 7c0cfcf806a7..2b89135329e6 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -77438,27 +77850,18 @@ index 7c0cfcf806a7..2b89135329e6 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- Library("net_helpers_gn")
>-diff --git third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
>-index 9fb05f529e15..2c7aeb42782b 100644
>---- third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
>+-
>+ 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 7c0cfcf806a7..2b89135329e6 100644
>+--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77481,7 +77884,7 @@ index 9fb05f529e15..2c7aeb42782b 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -77500,6 +77903,11 @@ index 9fb05f529e15..2c7aeb42782b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -77565,6 +77973,12 @@ index 9fb05f529e15..2c7aeb42782b 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -77574,6 +77988,10 @@ index 9fb05f529e15..2c7aeb42782b 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -77590,10 +78008,12 @@ index 9fb05f529e15..2c7aeb42782b 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -77615,16 +78035,21 @@ index 9fb05f529e15..2c7aeb42782b 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -77634,18 +78059,27 @@ index 9fb05f529e15..2c7aeb42782b 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("ecn_marking_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 604cb9a5e8c8..63df6c684225 100644
>---- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ Library("net_helpers_gn")
>+diff --git third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
>+index 9fb05f529e15..2c7aeb42782b 100644
>+--- third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77668,7 +78102,7 @@ index 604cb9a5e8c8..63df6c684225 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -77761,10 +78195,6 @@ index 604cb9a5e8c8..63df6c684225 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -77781,12 +78211,10 @@ index 604cb9a5e8c8..63df6c684225 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -77808,21 +78236,16 @@ index 604cb9a5e8c8..63df6c684225 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -77832,27 +78255,18 @@ index 604cb9a5e8c8..63df6c684225 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 eacf18519786..848db7fed53a 100644
>---- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
>+-
>+ Library("ecn_marking_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 604cb9a5e8c8..63df6c684225 100644
>+--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77875,7 +78289,7 @@ index eacf18519786..848db7fed53a 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -77894,10 +78308,6 @@ index eacf18519786..848db7fed53a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -78059,11 +78469,11 @@ index eacf18519786..848db7fed53a 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 2ae8cf3c3837..c32e0473a011 100644
>---- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
>+ 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 eacf18519786..848db7fed53a 100644
>+--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78270,11 +78680,11 @@ index 2ae8cf3c3837..c32e0473a011 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 da5eb5b49753..dd528ef3830e 100644
>---- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
>+ 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 2ae8cf3c3837..c32e0473a011 100644
>+--- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78297,7 +78707,7 @@ index da5eb5b49753..dd528ef3830e 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -78317,7 +78727,6 @@ index da5eb5b49753..dd528ef3830e 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -78386,13 +78795,6 @@ index da5eb5b49753..dd528ef3830e 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -78489,11 +78891,11 @@ index da5eb5b49753..dd528ef3830e 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 4de80444bef4..7d101ac9cbe4 100644
>---- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
>+ 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 da5eb5b49753..dd528ef3830e 100644
>+--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78516,7 +78918,7 @@ index 4de80444bef4..7d101ac9cbe4 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -78536,6 +78938,7 @@ index 4de80444bef4..7d101ac9cbe4 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -78604,6 +79007,13 @@ index 4de80444bef4..7d101ac9cbe4 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -78613,6 +79023,10 @@ index 4de80444bef4..7d101ac9cbe4 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -78629,10 +79043,12 @@ index 4de80444bef4..7d101ac9cbe4 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -78654,16 +79070,21 @@ index 4de80444bef4..7d101ac9cbe4 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -78673,18 +79094,27 @@ index 4de80444bef4..7d101ac9cbe4 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 8c259b6765c4..4632206d50e3 100644
>---- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 4de80444bef4..7d101ac9cbe4 100644
>+--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78707,7 +79137,7 @@ index 8c259b6765c4..4632206d50e3 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -78795,13 +79225,6 @@ index 8c259b6765c4..4632206d50e3 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -78811,10 +79234,6 @@ index 8c259b6765c4..4632206d50e3 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -78831,12 +79250,10 @@ index 8c259b6765c4..4632206d50e3 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -78858,21 +79275,16 @@ index 8c259b6765c4..4632206d50e3 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -78882,27 +79294,18 @@ index 8c259b6765c4..4632206d50e3 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 09d6147ce17d..7ed2f4dad2ac 100644
>---- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
>+-
>+ 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 8c259b6765c4..4632206d50e3 100644
>+--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78925,7 +79328,7 @@ index 09d6147ce17d..7ed2f4dad2ac 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79013,6 +79416,13 @@ index 09d6147ce17d..7ed2f4dad2ac 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -79109,11 +79519,11 @@ index 09d6147ce17d..7ed2f4dad2ac 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 c2b0d4ce2f3a..e926b3f5ca8f 100644
>---- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
>+ 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 09d6147ce17d..7ed2f4dad2ac 100644
>+--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79136,7 +79546,7 @@ index c2b0d4ce2f3a..e926b3f5ca8f 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79155,6 +79565,10 @@ index c2b0d4ce2f3a..e926b3f5ca8f 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -79229,6 +79643,10 @@ index c2b0d4ce2f3a..e926b3f5ca8f 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -79245,10 +79663,12 @@ index c2b0d4ce2f3a..e926b3f5ca8f 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -79270,16 +79690,21 @@ index c2b0d4ce2f3a..e926b3f5ca8f 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -79289,18 +79714,27 @@ index c2b0d4ce2f3a..e926b3f5ca8f 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 1fef37a2babc..74fad97cb21c 100644
>---- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 c2b0d4ce2f3a..e926b3f5ca8f 100644
>+--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79323,7 +79757,7 @@ index 1fef37a2babc..74fad97cb21c 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79342,10 +79776,6 @@ index 1fef37a2babc..74fad97cb21c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -79420,10 +79850,6 @@ index 1fef37a2babc..74fad97cb21c 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -79440,12 +79866,10 @@ index 1fef37a2babc..74fad97cb21c 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -79467,21 +79891,16 @@ index 1fef37a2babc..74fad97cb21c 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -79491,27 +79910,18 @@ index 1fef37a2babc..74fad97cb21c 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 6c9b369317a5..1046794552e2 100644
>---- third_party/libwebrtc/rtc_base/random_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/random_gn/moz.build
>+-
>+ 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 1fef37a2babc..74fad97cb21c 100644
>+--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79718,11 +80128,11 @@ index 6c9b369317a5..1046794552e2 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 586fc513dc7e..64b9286d41ca 100644
>---- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
>+ 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 6c9b369317a5..1046794552e2 100644
>+--- third_party/libwebrtc/rtc_base/random_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/random_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79745,7 +80155,7 @@ index 586fc513dc7e..64b9286d41ca 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79793,10 +80203,6 @@ index 586fc513dc7e..64b9286d41ca 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -79837,13 +80243,6 @@ index 586fc513dc7e..64b9286d41ca 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -79940,11 +80339,11 @@ index 586fc513dc7e..64b9286d41ca 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 76d4f9d980ae..64ffc5e8413b 100644
>---- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
>+ 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 586fc513dc7e..64b9286d41ca 100644
>+--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79967,7 +80366,7 @@ index 76d4f9d980ae..64ffc5e8413b 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -80015,6 +80414,10 @@ index 76d4f9d980ae..64ffc5e8413b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -80158,11 +80561,11 @@ index 76d4f9d980ae..64ffc5e8413b 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 c381e91cdc55..0a743006bcf0 100644
>---- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
>+ 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 76d4f9d980ae..64ffc5e8413b 100644
>+--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -80376,11 +80779,11 @@ index c381e91cdc55..0a743006bcf0 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 4059c66e7135..ab2a71dd87dc 100644
>---- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
>+ 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 c381e91cdc55..0a743006bcf0 100644
>+--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -80403,7 +80806,7 @@ index 4059c66e7135..ab2a71dd87dc 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -80422,6 +80825,10 @@ index 4059c66e7135..ab2a71dd87dc 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -80487,6 +80894,13 @@ index 4059c66e7135..ab2a71dd87dc 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -80496,6 +80910,10 @@ index 4059c66e7135..ab2a71dd87dc 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -80512,10 +80930,12 @@ index 4059c66e7135..ab2a71dd87dc 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -80537,16 +80957,21 @@ index 4059c66e7135..ab2a71dd87dc 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -80556,18 +80981,27 @@ index 4059c66e7135..ab2a71dd87dc 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 c8e14d5996e0..07964d2b4972 100644
>---- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 4059c66e7135..ab2a71dd87dc 100644
>+--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -80590,7 +81024,7 @@ index c8e14d5996e0..07964d2b4972 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -80609,10 +81043,6 @@ index c8e14d5996e0..07964d2b4972 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -80703,7 +81133,7 @@ index c8e14d5996e0..07964d2b4972 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>  
>      DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>@@ -80754,11 +81184,11 @@ index c8e14d5996e0..07964d2b4972 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 a1b2840da3ea..6279462eabf7 100644
>---- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
>+ 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 c8e14d5996e0..07964d2b4972 100644
>+--- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -80781,7 +81211,7 @@ index a1b2840da3ea..6279462eabf7 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -80869,13 +81299,6 @@ index a1b2840da3ea..6279462eabf7 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -80885,10 +81308,6 @@ index a1b2840da3ea..6279462eabf7 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -80905,12 +81324,10 @@ index a1b2840da3ea..6279462eabf7 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -80932,21 +81349,16 @@ index a1b2840da3ea..6279462eabf7 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -80956,27 +81368,18 @@ index a1b2840da3ea..6279462eabf7 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 6bcce7ecf591..0127c502b6f6 100644
>---- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
>+-
>+ 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 a1b2840da3ea..6279462eabf7 100644
>+--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -80999,7 +81402,7 @@ index 6bcce7ecf591..0127c502b6f6 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -45,178 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -81087,6 +81490,13 @@ index 6bcce7ecf591..0127c502b6f6 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -81183,11 +81593,11 @@ index 6bcce7ecf591..0127c502b6f6 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("rtc_numerics_gn")
>-diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
>-index 1e381892f367..8fc4c2183d80 100644
>---- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
>+ 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 6bcce7ecf591..0127c502b6f6 100644
>+--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81210,7 +81620,7 @@ index 1e381892f367..8fc4c2183d80 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,178 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -81229,6 +81639,10 @@ index 1e381892f367..8fc4c2183d80 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -81303,6 +81717,10 @@ index 1e381892f367..8fc4c2183d80 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -81319,10 +81737,12 @@ index 1e381892f367..8fc4c2183d80 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -81344,16 +81764,21 @@ index 1e381892f367..8fc4c2183d80 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -81363,18 +81788,27 @@ index 1e381892f367..8fc4c2183d80 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 f409a3834780..3ba803fa49d4 100644
>---- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ Library("rtc_numerics_gn")
>+diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
>+index 1e381892f367..8fc4c2183d80 100644
>+--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81397,7 +81831,7 @@ index f409a3834780..3ba803fa49d4 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -81416,10 +81850,6 @@ index f409a3834780..3ba803fa49d4 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -81510,7 +81940,7 @@ index f409a3834780..3ba803fa49d4 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>  
>      DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>@@ -81561,11 +81991,11 @@ index f409a3834780..3ba803fa49d4 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 31299792ebeb..a03b4cdd095d 100644
>---- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
>+ 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 f409a3834780..3ba803fa49d4 100644
>+--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81752,11 +82182,11 @@ index 31299792ebeb..a03b4cdd095d 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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 0657de77c15b..fc147e94f56f 100644
>---- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>+ 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 31299792ebeb..a03b4cdd095d 100644
>+--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81779,7 +82209,7 @@ index 0657de77c15b..fc147e94f56f 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -81876,10 +82306,6 @@ index 0657de77c15b..fc147e94f56f 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -81896,12 +82322,10 @@ index 0657de77c15b..fc147e94f56f 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -81923,21 +82347,16 @@ index 0657de77c15b..fc147e94f56f 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -81947,27 +82366,18 @@ index 0657de77c15b..fc147e94f56f 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 dcdcffdd8ef4..fb6cf9adbb71 100644
>---- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>+-
>+ 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 0657de77c15b..fc147e94f56f 100644
>+--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81990,7 +82400,7 @@ index dcdcffdd8ef4..fb6cf9adbb71 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82009,6 +82419,10 @@ index dcdcffdd8ef4..fb6cf9adbb71 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -82083,6 +82497,10 @@ index dcdcffdd8ef4..fb6cf9adbb71 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -82099,10 +82517,12 @@ index dcdcffdd8ef4..fb6cf9adbb71 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -82124,16 +82544,21 @@ index dcdcffdd8ef4..fb6cf9adbb71 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -82143,18 +82568,27 @@ index dcdcffdd8ef4..fb6cf9adbb71 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 2e5c00378acd..78d31c99625b 100644
>---- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 dcdcffdd8ef4..fb6cf9adbb71 100644
>+--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -82177,7 +82611,7 @@ index 2e5c00378acd..78d31c99625b 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82196,11 +82630,6 @@ index 2e5c00378acd..78d31c99625b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -82266,13 +82695,6 @@ index 2e5c00378acd..78d31c99625b 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -82282,10 +82704,6 @@ index 2e5c00378acd..78d31c99625b 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -82302,12 +82720,10 @@ index 2e5c00378acd..78d31c99625b 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -82329,21 +82745,16 @@ index 2e5c00378acd..78d31c99625b 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -82353,27 +82764,18 @@ index 2e5c00378acd..78d31c99625b 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 572b2f62b08c..23ceff9330b2 100644
>---- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>+-
>+ 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 2e5c00378acd..78d31c99625b 100644
>+--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -82396,7 +82798,7 @@ index 572b2f62b08c..23ceff9330b2 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82501,6 +82903,10 @@ index 572b2f62b08c..23ceff9330b2 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -82517,10 +82923,12 @@ index 572b2f62b08c..23ceff9330b2 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -82542,16 +82950,21 @@ index 572b2f62b08c..23ceff9330b2 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -82561,18 +82974,27 @@ index 572b2f62b08c..23ceff9330b2 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- 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 4b08aeb0de91..d8dcd1ca715e 100644
>---- third_party/libwebrtc/rtc_base/socket_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 572b2f62b08c..23ceff9330b2 100644
>+--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -82595,7 +83017,7 @@ index 4b08aeb0de91..d8dcd1ca715e 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82700,10 +83122,6 @@ index 4b08aeb0de91..d8dcd1ca715e 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -82720,12 +83138,10 @@ index 4b08aeb0de91..d8dcd1ca715e 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>--if CONFIG["TARGET_CPU"] == "x86_64":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--
>+@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -82747,21 +83163,16 @@ index 4b08aeb0de91..d8dcd1ca715e 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>--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
>@@ -82771,27 +83182,18 @@ index 4b08aeb0de91..d8dcd1ca715e 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>+-
> -    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- 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 d4654af6fc1f..265a05693776 100644
>---- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>+-
>+ 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 4b08aeb0de91..d8dcd1ca715e 100644
>+--- third_party/libwebrtc/rtc_base/socket_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -82814,7 +83216,7 @@ index d4654af6fc1f..265a05693776 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82919,6 +83321,10 @@ index d4654af6fc1f..265a05693776 100644
>  
> -if CONFIG["TARGET_CPU"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -82935,10 +83341,12 @@ index d4654af6fc1f..265a05693776 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>+-    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
>@@ -82960,16 +83368,21 @@ index d4654af6fc1f..265a05693776 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
> -
> -    OS_LIBS += [
> -        "unwind"
> -    ]
> -
>+-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
>@@ -82979,18 +83392,27 @@ index d4654af6fc1f..265a05693776 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
> -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>--
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
> -    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("socket_server_gn")
>-diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build
>-index 599001039a48..a2cf5b7c9ecd 100644
>---- third_party/libwebrtc/rtc_base/ssl_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 d4654af6fc1f..265a05693776 100644
>+--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -83013,7 +83435,7 @@ index 599001039a48..a2cf5b7c9ecd 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -83032,6 +83454,11 @@ index 599001039a48..a2cf5b7c9ecd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -83097,6 +83524,13 @@ index 599001039a48..a2cf5b7c9ecd 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["TARGET_CPU"] == "aarch64":
>@@ -83122,7 +83556,7 @@ index 599001039a48..a2cf5b7c9ecd 100644
>  
>  if CONFIG["TARGET_CPU"] == "x86":
>  
>-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>+@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
>  
>      DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  
>@@ -83173,11 +83607,11 @@ index 599001039a48..a2cf5b7c9ecd 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("ssl_gn")
>-diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>-index 5016b4fce059..44112c834b87 100644
>---- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>+ 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 66251b8e86a1..a920e0e0e95b 100644
>+--- third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -83200,7 +83634,7 @@ index 5016b4fce059..44112c834b87 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -47,178 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -83219,10 +83653,197 @@ index 5016b4fce059..44112c834b87 100644
> -    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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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":
>+ 
>+     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":
>+ 
>+@@ -149,50 +69,8 @@ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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("ssl_adapter_gn")
>+diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>+index 5016b4fce059..44112c834b87 100644
>+--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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,178 +57,32 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_MAC"] = True
>@@ -89249,7 +89870,436 @@ index 30aa20ae3ede..c5bb79c454fc 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,185 +53,32 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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":
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ Library("field_trial_gn")
>+diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>+index 2347fbcbacf5..31a75cc714e1 100644
>+--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>++++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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,178 +53,32 @@ 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"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    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_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["TARGET_CPU"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>+-
>+-    OS_LIBS += [
>+-        "unwind"
>+-    ]
>+-
>+-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":
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++if CONFIG["TARGET_CPU"] == "x86_64":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ 
>+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+-    DEFINES["_GNU_SOURCE"] = True
>++    DEFINES["USE_X11"] = "1"
>+ 
>+ 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 161fe336d913..ade9b1212194 100644
>+--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>++++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ 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,199 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -89268,6 +90318,12 @@ index 30aa20ae3ede..c5bb79c454fc 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    LOCAL_INCLUDES += [
>+-        "/config/external/nspr/",
>+-        "/nsprpub/lib/ds/",
>+-        "/nsprpub/pr/include/"
>+-    ]
>+-
> -    OS_LIBS += [
> -        "log"
> -    ]
>@@ -89297,6 +90353,14 @@ index 30aa20ae3ede..c5bb79c454fc 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -89440,11 +90504,11 @@ index 30aa20ae3ede..c5bb79c454fc 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- Library("field_trial_gn")
>-diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>-index 2347fbcbacf5..31a75cc714e1 100644
>---- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>-+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>+ Library("system_wrappers_gn")
>+diff --git third_party/libwebrtc/test/network/simulated_network_gn/moz.build third_party/libwebrtc/test/network/simulated_network_gn/moz.build
>+index 26939945bfb9..bda1c894e9e1 100644
>+--- third_party/libwebrtc/test/network/simulated_network_gn/moz.build
>++++ third_party/libwebrtc/test/network/simulated_network_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -89651,239 +90715,7 @@ index 2347fbcbacf5..31a75cc714e1 100644
> -    DEFINES["_GNU_SOURCE"] = True
> +    DEFINES["USE_X11"] = "1"
>  
>- 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 161fe336d913..ade9b1212194 100644
>---- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>-+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_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_LIBEVENT"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- 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,199 +57,32 @@ 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"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    LOCAL_INCLUDES += [
>--        "/config/external/nspr/",
>--        "/nsprpub/lib/ds/",
>--        "/nsprpub/pr/include/"
>--    ]
>--
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    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_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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
>--
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = 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_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["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["TARGET_CPU"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--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"] == "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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
>--
>--    OS_LIBS += [
>--        "unwind"
>--    ]
>--
>--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":
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+if CONFIG["TARGET_CPU"] == "x86_64":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- 
>--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>--    DEFINES["_GNU_SOURCE"] = True
>-+    DEFINES["USE_X11"] = "1"
>- 
>- Library("system_wrappers_gn")
>+ Library("simulated_network_gn")
> diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
> index 5a0d4a3984ef..020143107080 100644
> --- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
>@@ -94865,7 +95697,7 @@ index b10b4c330ef8..3703f7ef3366 100644
>  
>  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 4bbb3e4e624c..62040f7084c2 100644
>+index 54334034a290..771396806039 100644
> --- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
> +++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
>@@ -94890,7 +95722,7 @@ index 4bbb3e4e624c..62040f7084c2 100644
>  
>  FINAL_LIBRARY = "xul"
>  
>-@@ -52,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -51,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 281985: 254130 | 254137 | 254138 | 254145 | 254199 | 254222