www/firefox: update to 115.0 (rc1)

Release Notes (soon): https://www.mozilla.org/en-US/firefox/115.0/releasenotes/
author: Christoph Moench-Tegeder <cmt@FreeBSD.org> 2023-06-27 21:13:04 +0000
committer: Christoph Moench-Tegeder <cmt@FreeBSD.org> 2023-06-27 21:13:04 +0000
commit: cc72a4893237befed7f631554f489f72f7f130fb (patch)
tree: 6cccb2799d1a122433d3dff417c46cd6ca01631d
parent: d93e409971e167bdad655af3ca8e6ff09a639ee7 (diff)
download: ports-cc72a4893237befed7f631554f489f72f7f130fb.tar.gz
ports-cc72a4893237befed7f631554f489f72f7f130fb.zip
6 files changed, 2408 insertions, 1099 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 2a8e6aea82e4..0f514f9cc3f2 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -60,12 +60,17 @@ MOZILLA?=	${PORTNAME}
 MOZILLA_VER?=	${PORTVERSION}
 MOZILLA_BIN?=	${PORTNAME}-bin
 MOZILLA_EXEC_NAME?=${MOZILLA}
-USES+=		compiler:c++17-lang cpe gl gmake gnome iconv localbase perl5 pkgconfig \
-			python:build desktop-file-utils
+USES+=		compiler:c++17-lang cpe gl gmake gnome iconv localbase pkgconfig \
+			python,build desktop-file-utils
+.if ${MOZILLA_VER:R:R} < 115
+USES+=		perl5
+.endif
 CPE_VENDOR?=mozilla
 USE_GL=		gl
 USE_GNOME=	cairo gdkpixbuf2 gtk30
+.if ${MOZILLA_VER:R:R} < 115
 USE_PERL5=	build
+.endif
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrandr xrender xt xtst
 HAS_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
@@ -82,9 +87,11 @@ LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
 LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
 MOZ_EXPORT+=	${CONFIGURE_ENV} \
-				PERL="${PERL}" \
 				PYTHON3="${PYTHON_CMD}" \
 				RUSTFLAGS="${RUSTFLAGS}"
+.if ${MOZILLA_VER:R:R} < 115
+MOZ_EXPORT+=	 PERL="${PERL}"
+.endif
 MOZ_OPTIONS+=	--prefix="${PREFIX}"
 MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"
 
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index ff90a0c93fe4..698377e6ebcf 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	firefox
-DISTVERSION=	114.0.2
+DISTVERSION=	115.0
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -11,10 +11,10 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.89:security/nss \
-		icu>=72.1:devel/icu \
+		nss>=3.90:security/nss \
+		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
-		harfbuzz>=7.1.0:print/harfbuzz \
+		harfbuzz>=7.3.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.39:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 7b8ce39bc772..846496e7f797 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687175824
-SHA256 (firefox-114.0.2.source.tar.xz) = aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe
-SIZE (firefox-114.0.2.source.tar.xz) = 505974216
+TIMESTAMP = 1687898233
+SHA256 (firefox-115.0.source.tar.xz) = ba2e725edda4186f4dbd66553145d8f129ef0bdd4919e995c88e69178c60ac3a
+SIZE (firefox-115.0.source.tar.xz) = 509003572
diff --git a/www/firefox/files/patch-addon-search b/www/firefox/files/patch-addon-search
index f9d788fbad73..b6dbf7924b43 100644
--- a/www/firefox/files/patch-addon-search
+++ b/www/firefox/files/patch-addon-search
@@ -2,7 +2,7 @@ https://github.com/mozilla/addons/issues/708
 https://github.com/mozilla/addons-frontend/issues/4610
 
 diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js
-index af08811..77a3b18 100644
+index 621900f90fc1..401ef9074bd0 100644
 --- browser/app/profile/firefox.js
 +++ browser/app/profile/firefox.js
 @@ -38,7 +38,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true);
@@ -14,7 +14,7 @@ index af08811..77a3b18 100644
  pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
  pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%");
  pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
-@@ -193,8 +193,8 @@ pref("app.update.langpack.enabled", true);
+@@ -204,8 +204,8 @@ pref("app.update.langpack.enabled", true);
  //  .. etc ..
  //
  pref("extensions.update.enabled", true);
@@ -25,24 +25,24 @@ index af08811..77a3b18 100644
  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
                                              // Themes every day
  
-diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm
-index 661c902..a41b32f 100644
---- toolkit/mozapps/extensions/internal/AddonRepository.jsm
-+++ toolkit/mozapps/extensions/internal/AddonRepository.jsm
-@@ -592,7 +592,7 @@ var AddonRepository = {
+diff --git toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs
+index f906f244b658..7bb2eb6697c6 100644
+--- toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs
++++ toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs
+@@ -596,7 +596,7 @@ export var AddonRepository = {
        addon.version = String(aEntry.current_version.version);
        if (Array.isArray(aEntry.current_version.files)) {
          for (let file of aEntry.current_version.files) {
 -          if (file.platform == "all" || file.platform == lazy.PLATFORM) {
 +          if (file.platform == "all" || file.platform == "linux" || file.platform == lazy.PLATFORM) {
              if (file.url) {
-               addon.sourceURI = NetUtil.newURI(file.url);
+               addon.sourceURI = lazy.NetUtil.newURI(file.url);
              }
 diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm
-index f8c99c7..c6ba8a1 100644
+index 03186dad43a4..4053fc6f2702 100644
 --- toolkit/mozapps/extensions/internal/XPIDatabase.jsm
 +++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm
-@@ -520,7 +520,7 @@ class AddonInternal {
+@@ -634,7 +634,7 @@ class AddonInternal {
      // Something is causing errors in here
      try {
        for (let platform of this.targetPlatforms) {
diff --git a/www/firefox/files/patch-bug1640982 b/www/firefox/files/patch-bug1640982
deleted file mode 100644
index 5ad0fbad6c72..000000000000
--- a/www/firefox/files/patch-bug1640982
+++ /dev/null
@@ -1,17 +0,0 @@
-Unbreak build with Rust 1.45.0
-
-error: options `-C embed-bitcode=no` and `-C lto` are incompatible
-
-diff --git config/makefiles/rust.mk config/makefiles/rust.mk
-index 75570d3..94ec33f 100644
---- config/makefiles/rust.mk
-+++ config/makefiles/rust.mk
-@@ -97,7 +97,7 @@ ifndef rustflags_sancov
- # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
- ifndef MOZ_CODE_COVERAGE
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += 
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 0de66b1b0116..2f46714ce495 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,7 +1,7 @@
-commit 2eafa75dbec1817680f1074cb7baa45d6734c8d9
+commit ddd5c82284f974ce7fc5857e2a3061a83ed45094
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
-    regenerate FreeBSD libwebrtc patch for Firefox 114
+    regenerate FreeBSD libwebrtc patch for Firefox 115
 
 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 c3f52293bf1b..46d0a26b3591 100644
@@ -5997,7 +5997,7 @@ index fb54663aa230..88d540626600 100644
 -
  Library("call_api_gn")
 diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build
-index fd28a9f043eb..af94caebd288 100644
+index ff1e226a47bb..af94caebd288 100644
 --- third_party/libwebrtc/api/callfactory_api_gn/moz.build
 +++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6022,7 +6022,7 @@ index fd28a9f043eb..af94caebd288 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6042,7 +6042,6 @@ index fd28a9f043eb..af94caebd288 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -6072,7 +6071,6 @@ index fd28a9f043eb..af94caebd288 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -6568,7 +6566,7 @@ index b4b02bc0fd68..bb7875318eb2 100644
 -
  Library("frame_encryptor_interface_gn")
 diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index c3fc7472b755..8847d0f5eae0 100644
+index e4b496ffcab2..8847d0f5eae0 100644
 --- third_party/libwebrtc/api/crypto/options_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/options_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6593,7 +6591,7 @@ index c3fc7472b755..8847d0f5eae0 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6612,11 +6610,6 @@ index c3fc7472b755..8847d0f5eae0 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "GLESv2",
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6642,11 +6635,6 @@ index c3fc7472b755..8847d0f5eae0 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -6687,13 +6675,6 @@ index c3fc7472b755..8847d0f5eae0 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -6743,11 +6724,12 @@ index c3fc7472b755..8847d0f5eae0 100644
 -    ]
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -6756,25 +6738,24 @@ index c3fc7472b755..8847d0f5eae0 100644
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
@@ -7345,7 +7326,7 @@ index 2546c5d6c76d..ddb7e9e6a62d 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 3c39211ab5e2..2f54084a65d9 100644
+index 7aa531c02248..2f54084a65d9 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()
@@ -7370,7 +7351,7 @@ index 3c39211ab5e2..2f54084a65d9 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7390,7 +7371,6 @@ index 3c39211ab5e2..2f54084a65d9 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -7420,7 +7400,6 @@ index 3c39211ab5e2..2f54084a65d9 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -9666,10 +9645,10 @@ index a7da1f7e3bb0..422517f8411b 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("network_state_predictor_api_gn")
-diff --git third_party/libwebrtc/api/numerics/numerics_gn/moz.build third_party/libwebrtc/api/numerics/numerics_gn/moz.build
-index 58aeb51a22f7..6bbc27e50970 100644
---- third_party/libwebrtc/api/numerics/numerics_gn/moz.build
-+++ third_party/libwebrtc/api/numerics/numerics_gn/moz.build
+diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
+index 191c836d8508..44ae2b5bf6ea 100644
+--- third_party/libwebrtc/api/priority_gn/moz.build
++++ third_party/libwebrtc/api/priority_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -9692,7 +9671,7 @@ index 58aeb51a22f7..6bbc27e50970 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9711,10 +9690,6 @@ index 58aeb51a22f7..6bbc27e50970 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9780,10 +9755,6 @@ index 58aeb51a22f7..6bbc27e50970 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -9793,10 +9764,6 @@ index 58aeb51a22f7..6bbc27e50970 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -9822,9 +9789,10 @@ index 58aeb51a22f7..6bbc27e50970 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -9834,10 +9802,6 @@ index 58aeb51a22f7..6bbc27e50970 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -9853,27 +9817,20 @@ index 58aeb51a22f7..6bbc27e50970 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["USE_X11"] = "1"
- 
- Library("numerics_gn")
-diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index 191c836d8508..44ae2b5bf6ea 100644
---- third_party/libwebrtc/api/priority_gn/moz.build
-+++ third_party/libwebrtc/api/priority_gn/moz.build
+-
+ Library("priority_gn")
+diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
+index 50d1dc895081..e6ea3a8d349d 100644
+--- third_party/libwebrtc/api/refcountedbase_gn/moz.build
++++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -10051,11 +10008,11 @@ index 191c836d8508..44ae2b5bf6ea 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("priority_gn")
-diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 50d1dc895081..e6ea3a8d349d 100644
---- third_party/libwebrtc/api/refcountedbase_gn/moz.build
-+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
+ Library("refcountedbase_gn")
+diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
+index 5beae090b99a..9147a790d33e 100644
+--- third_party/libwebrtc/api/rtc_error_gn/moz.build
++++ third_party/libwebrtc/api/rtc_error_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -10078,7 +10035,7 @@ index 50d1dc895081..e6ea3a8d349d 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10097,6 +10054,10 @@ index 50d1dc895081..e6ea3a8d349d 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10162,6 +10123,10 @@ index 50d1dc895081..e6ea3a8d349d 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -10171,6 +10136,10 @@ index 50d1dc895081..e6ea3a8d349d 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -10196,10 +10165,9 @@ index 50d1dc895081..e6ea3a8d349d 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -10209,6 +10177,10 @@ index 50d1dc895081..e6ea3a8d349d 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -10224,20 +10196,27 @@ index 50d1dc895081..e6ea3a8d349d 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("refcountedbase_gn")
-diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 5beae090b99a..9147a790d33e 100644
---- third_party/libwebrtc/api/rtc_error_gn/moz.build
-+++ third_party/libwebrtc/api/rtc_error_gn/moz.build
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("rtc_error_gn")
+diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
+index bda287e729a7..ba95c9db6fa9 100644
+--- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
++++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -10260,7 +10239,7 @@ index 5beae090b99a..9147a790d33e 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10437,11 +10416,11 @@ index 5beae090b99a..9147a790d33e 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("rtc_error_gn")
-diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index bda287e729a7..ba95c9db6fa9 100644
---- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-+++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
+ Library("rtc_event_log_gn")
+diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
+index ee29948e6455..c7fdc41cbd06 100644
+--- third_party/libwebrtc/api/rtp_headers_gn/moz.build
++++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -10464,7 +10443,7 @@ index bda287e729a7..ba95c9db6fa9 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10641,11 +10620,11 @@ index bda287e729a7..ba95c9db6fa9 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("rtc_event_log_gn")
-diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index ee29948e6455..c7fdc41cbd06 100644
---- third_party/libwebrtc/api/rtp_headers_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
+ Library("rtp_headers_gn")
+diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+index b2eb8ef5a7ff..40dceac38a1f 100644
+--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
++++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -10845,11 +10824,11 @@ index ee29948e6455..c7fdc41cbd06 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("rtp_headers_gn")
-diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index b2eb8ef5a7ff..40dceac38a1f 100644
---- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+ Library("rtp_packet_info_gn")
+diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+index 3c367bed3bb9..dd7145a56759 100644
+--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
++++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -10872,7 +10851,7 @@ index b2eb8ef5a7ff..40dceac38a1f 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,169 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10960,10 +10939,6 @@ index b2eb8ef5a7ff..40dceac38a1f 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -11049,11 +11024,11 @@ index b2eb8ef5a7ff..40dceac38a1f 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("rtp_packet_info_gn")
-diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index 3c367bed3bb9..dd7145a56759 100644
---- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+ Library("rtp_parameters_gn")
+diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
+index 54c091ac7bed..43683534aba1 100644
+--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
++++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -11076,7 +11051,7 @@ index 3c367bed3bb9..dd7145a56759 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,169 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11095,10 +11070,6 @@ index 3c367bed3bb9..dd7145a56759 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11173,10 +11144,6 @@ index 3c367bed3bb9..dd7145a56759 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -11202,9 +11169,10 @@ index 3c367bed3bb9..dd7145a56759 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -11214,10 +11182,6 @@ index 3c367bed3bb9..dd7145a56759 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -11233,23 +11197,16 @@ index 3c367bed3bb9..dd7145a56759 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["USE_X11"] = "1"
- 
- Library("rtp_parameters_gn")
+-
+ Library("rtp_sender_interface_gn")
 diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
 index 2c59bcc25159..6e18f5b8ccfa 100644
 --- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
@@ -12005,7 +11962,7 @@ index a040d96e814e..01068ebc09ba 100644
 -
  Library("sequence_checker_gn")
 diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-index 9baf23450a32..abb4c1fd1905 100644
+index 508948c5ed5b..abb4c1fd1905 100644
 --- third_party/libwebrtc/api/simulated_network_api_gn/moz.build
 +++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12030,7 +11987,7 @@ index 9baf23450a32..abb4c1fd1905 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12050,7 +12007,6 @@ index 9baf23450a32..abb4c1fd1905 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -12079,11 +12035,6 @@ index 9baf23450a32..abb4c1fd1905 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -12124,13 +12075,6 @@ index 9baf23450a32..abb4c1fd1905 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -13194,7 +13138,7 @@ index 1908dc466677..888e6cd29d2b 100644
  
  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 53db9cfb52f8..b4bf72798b33 100644
+index b438b01c9f76..b4bf72798b33 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()
@@ -13219,7 +13163,7 @@ index 53db9cfb52f8..b4bf72798b33 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13239,7 +13183,6 @@ index 53db9cfb52f8..b4bf72798b33 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -13269,7 +13212,6 @@ index 53db9cfb52f8..b4bf72798b33 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -15379,7 +15321,7 @@ index d1ce652a1d21..09d5c53c0e8c 100644
  
  Library("timestamp_gn")
 diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index a0d8b5aba6db..7ad1ec737b60 100644
+index ae89a504490d..7ad1ec737b60 100644
 --- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15404,7 +15346,7 @@ index a0d8b5aba6db..7ad1ec737b60 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15454,7 +15396,6 @@ index a0d8b5aba6db..7ad1ec737b60 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -15592,7 +15533,7 @@ index a0d8b5aba6db..7ad1ec737b60 100644
  
  Library("builtin_video_bitrate_allocator_factory_gn")
 diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index 4a46bed39a5e..27a72c527aae 100644
+index 5c92663f5d1b..27a72c527aae 100644
 --- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15617,7 +15558,7 @@ index 4a46bed39a5e..27a72c527aae 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15637,7 +15578,6 @@ index 4a46bed39a5e..27a72c527aae 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -15667,7 +15607,6 @@ index 4a46bed39a5e..27a72c527aae 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -16009,7 +15948,7 @@ index decf74cfbedb..4c16ea3d2ae3 100644
  
  Library("encoded_image_gn")
 diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index d3a206301635..01a2a71c9623 100644
+index 7a31ccedc72e..01a2a71c9623 100644
 --- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
 +++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16034,7 +15973,7 @@ index d3a206301635..01a2a71c9623 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16054,7 +15993,6 @@ index d3a206301635..01a2a71c9623 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -16084,7 +16022,6 @@ index d3a206301635..01a2a71c9623 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -17952,7 +17889,7 @@ index 6e742c8d81d8..443eb4d84288 100644
  
  Library("video_frame_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index b9243d3e5a39..ce7f52845f53 100644
+index 3fa0830088fc..0eec78099ce6 100644
 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17977,7 +17914,7 @@ index b9243d3e5a39..ce7f52845f53 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -49,182 +59,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,173 +60,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17997,7 +17934,6 @@ index b9243d3e5a39..ce7f52845f53 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -18026,11 +17962,6 @@ index b9243d3e5a39..ce7f52845f53 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -18073,9 +18004,6 @@ index b9243d3e5a39..ce7f52845f53 100644
 -    DEFINES["__STD_C"] = True
 -
 -    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
 -        "winmm"
 -    ]
 +    DEFINES["_DEBUG"] = True
@@ -18155,10 +18083,10 @@ index b9243d3e5a39..ce7f52845f53 100644
  
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
  
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
@@ -19317,7 +19245,7 @@ index 7fd6366deb59..96302de324a1 100644
 -
  Library("bitstream_parser_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index b66e361a98a3..ec8c9b5bb69f 100644
+index b1062ee23e27..ec8c9b5bb69f 100644
 --- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19342,7 +19270,7 @@ index b66e361a98a3..ec8c9b5bb69f 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,182 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,181 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19392,7 +19320,6 @@ index b66e361a98a3..ec8c9b5bb69f 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -19934,7 +19861,7 @@ index 6e6ab8ff7de5..28b53698939f 100644
  
  Library("video_codecs_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 5a9179f7acb5..1be3d8d2cff3 100644
+index c9836b7b0116..1be3d8d2cff3 100644
 --- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19959,7 +19886,7 @@ index 5a9179f7acb5..1be3d8d2cff3 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19979,7 +19906,6 @@ index 5a9179f7acb5..1be3d8d2cff3 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -20009,7 +19935,6 @@ index 5a9179f7acb5..1be3d8d2cff3 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -20329,7 +20254,7 @@ index 6dbab87917fd..f61bf9ad2f5b 100644
 -
  Library("video_track_source_constraints_gn")
 diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index c69a487c0346..56fac825d60b 100644
+index 002061416e71..56fac825d60b 100644
 --- third_party/libwebrtc/audio/audio_gn/moz.build
 +++ third_party/libwebrtc/audio/audio_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20354,7 +20279,7 @@ index c69a487c0346..56fac825d60b 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -55,182 +65,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,181 +65,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20404,7 +20329,6 @@ index c69a487c0346..56fac825d60b 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -20753,7 +20677,7 @@ index ee505ec8852a..e7a97d4d85e3 100644
  
  Library("audio_frame_operations_gn")
 diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index c971c1efed17..148769984dcc 100644
+index ade930c107f0..148769984dcc 100644
 --- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 +++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20778,7 +20702,7 @@ index c971c1efed17..148769984dcc 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -52,182 +62,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,180 +62,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20798,7 +20722,6 @@ index c971c1efed17..148769984dcc 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -20828,7 +20751,6 @@ index c971c1efed17..148769984dcc 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -21367,7 +21289,7 @@ index 5554b058f188..c51ea8539ecc 100644
  
  Library("bitrate_allocator_gn")
 diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index 56421fb5aabb..de916669d8a7 100644
+index 16240292e32c..de916669d8a7 100644
 --- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21392,7 +21314,7 @@ index 56421fb5aabb..de916669d8a7 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21412,7 +21334,6 @@ index 56421fb5aabb..de916669d8a7 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -21442,7 +21363,6 @@ index 56421fb5aabb..de916669d8a7 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -21580,7 +21500,7 @@ index 56421fb5aabb..de916669d8a7 100644
  
  Library("bitrate_configurator_gn")
 diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 2e6031f1be08..638cce6bd141 100644
+index caa099a6f298..638cce6bd141 100644
 --- third_party/libwebrtc/call/call_gn/moz.build
 +++ third_party/libwebrtc/call/call_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21605,7 +21525,7 @@ index 2e6031f1be08..638cce6bd141 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -45,182 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,181 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21655,7 +21575,6 @@ index 2e6031f1be08..638cce6bd141 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -21793,7 +21712,7 @@ index 2e6031f1be08..638cce6bd141 100644
  
  Library("call_gn")
 diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index efb519caf974..7f6530082e0d 100644
+index bd3cda2a7ba3..7f6530082e0d 100644
 --- third_party/libwebrtc/call/call_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21818,7 +21737,7 @@ index efb519caf974..7f6530082e0d 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -49,182 +59,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,180 +59,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21838,7 +21757,6 @@ index efb519caf974..7f6530082e0d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -21868,7 +21786,6 @@ index efb519caf974..7f6530082e0d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -22006,7 +21923,7 @@ index efb519caf974..7f6530082e0d 100644
  
  Library("call_interfaces_gn")
 diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index 1f2a32bcffd4..bb2bed8fee74 100644
+index 3fcacdf93f51..bb2bed8fee74 100644
 --- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22031,7 +21948,7 @@ index 1f2a32bcffd4..bb2bed8fee74 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22051,7 +21968,6 @@ index 1f2a32bcffd4..bb2bed8fee74 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -22081,7 +21997,6 @@ index 1f2a32bcffd4..bb2bed8fee74 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -22205,7 +22120,7 @@ index 1f2a32bcffd4..bb2bed8fee74 100644
 -
  Library("receive_stream_interface_gn")
 diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index 78fe9428ba13..db8671bd8a10 100644
+index 101cc096c354..db8671bd8a10 100644
 --- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22230,7 +22145,7 @@ index 78fe9428ba13..db8671bd8a10 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22250,7 +22165,6 @@ index 78fe9428ba13..db8671bd8a10 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -22280,7 +22194,6 @@ index 78fe9428ba13..db8671bd8a10 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -22418,7 +22331,7 @@ index 78fe9428ba13..db8671bd8a10 100644
  
  Library("rtp_interfaces_gn")
 diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index 605128bdcf59..06947d77d001 100644
+index 4a67ac908095..06947d77d001 100644
 --- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22443,7 +22356,7 @@ index 605128bdcf59..06947d77d001 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -45,182 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22463,7 +22376,6 @@ index 605128bdcf59..06947d77d001 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -22493,7 +22405,6 @@ index 605128bdcf59..06947d77d001 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -22631,7 +22542,7 @@ index 605128bdcf59..06947d77d001 100644
  
  Library("rtp_receiver_gn")
 diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index c3f29744ff72..c29148b84f8d 100644
+index 99122e269600..c29148b84f8d 100644
 --- third_party/libwebrtc/call/rtp_sender_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22656,7 +22567,7 @@ index c3f29744ff72..c29148b84f8d 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -45,182 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22676,7 +22587,6 @@ index c3f29744ff72..c29148b84f8d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -22706,7 +22616,6 @@ index c3f29744ff72..c29148b84f8d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -23040,7 +22949,7 @@ index 16e6085599bb..0799e640e201 100644
  
  Library("version_gn")
 diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build
-index 041c71570fd3..b034dc02a528 100644
+index 9b78f6b935c2..b034dc02a528 100644
 --- third_party/libwebrtc/call/video_stream_api_gn/moz.build
 +++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23065,7 +22974,7 @@ index 041c71570fd3..b034dc02a528 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,182 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23085,7 +22994,6 @@ index 041c71570fd3..b034dc02a528 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -23115,7 +23023,6 @@ index 041c71570fd3..b034dc02a528 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -26153,7 +26060,7 @@ index 86e8bb195287..7fd37387bf8c 100644
  
  Library("spl_sqrt_floor_gn")
 diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 74769a01ed9a..39b206e220bc 100644
+index baa9bb4286d4..39b206e220bc 100644
 --- third_party/libwebrtc/common_video/common_video_gn/moz.build
 +++ third_party/libwebrtc/common_video/common_video_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -26178,7 +26085,7 @@ index 74769a01ed9a..39b206e220bc 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -55,182 +65,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,173 +65,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26198,7 +26105,6 @@ index 74769a01ed9a..39b206e220bc 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -26227,11 +26133,6 @@ index 74769a01ed9a..39b206e220bc 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -26274,9 +26175,6 @@ index 74769a01ed9a..39b206e220bc 100644
 -    DEFINES["__STD_C"] = True
 -
 -    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
 -        "winmm"
 -    ]
 +    DEFINES["_DEBUG"] = True
@@ -26356,10 +26254,10 @@ index 74769a01ed9a..39b206e220bc 100644
  
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
  
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
@@ -26944,7 +26842,7 @@ index 2f9f14acb430..f8143d2798f0 100644
 -
  Library("registered_field_trials_header_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index 42838bcfaf6f..d1b3c8b5ba32 100644
+index 26a9e32bcfca..0542e02ca918 100644
 --- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -26969,7 +26867,7 @@ index 42838bcfaf6f..d1b3c8b5ba32 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -46,173 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,173 +57,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27960,7 +27858,7 @@ index 215d3877992c..cc818e164af5 100644
  
  Library("rtc_event_pacing_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index 6e0ada24f3a0..4982409d6855 100644
+index 377fff3de42d..4982409d6855 100644
 --- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27985,7 +27883,7 @@ index 6e0ada24f3a0..4982409d6855 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -46,182 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,180 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28005,7 +27903,6 @@ index 6e0ada24f3a0..4982409d6855 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -28035,7 +27932,6 @@ index 6e0ada24f3a0..4982409d6855 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -28580,8 +28476,1152 @@ index 904e69bad5fb..bccd9167c023 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("rtc_stream_config_gn")
+diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
+index 663a50541bf6..e59cc7d23c35 100644
+--- third_party/libwebrtc/media/codec_gn/moz.build
++++ third_party/libwebrtc/media/codec_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -43,173 +53,21 @@ 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_AVX2"] = 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_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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 += [
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("codec_gn")
+diff --git third_party/libwebrtc/media/delayable_gn/moz.build third_party/libwebrtc/media/delayable_gn/moz.build
+index d08c0c2715ea..cfa5c0894424 100644
+--- third_party/libwebrtc/media/delayable_gn/moz.build
++++ third_party/libwebrtc/media/delayable_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -39,153 +49,15 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("delayable_gn")
+diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
+index 7f30939e28bc..7374b4245abe 100644
+--- third_party/libwebrtc/media/media_channel_gn/moz.build
++++ third_party/libwebrtc/media/media_channel_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -39,169 +49,15 @@ 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_AVX2"] = 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_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("media_channel_gn")
+diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build
+index 4147b218c069..9e21e903f397 100644
+--- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
++++ third_party/libwebrtc/media/media_channel_impl_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -39,153 +49,15 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("media_channel_impl_gn")
+diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build
+index c72da4336a49..bdc3691547e6 100644
+--- third_party/libwebrtc/media/media_constants_gn/moz.build
++++ third_party/libwebrtc/media/media_constants_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -43,165 +53,21 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("media_constants_gn")
+diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
+index eb0f6fe980ab..82cdbd6123c1 100644
+--- third_party/libwebrtc/media/rid_description_gn/moz.build
++++ third_party/libwebrtc/media/rid_description_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -39,153 +49,15 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("rid_description_gn")
 diff --git third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
-index 5731b0403c7f..6358dd3a18f5 100644
+index 83188aa5862a..6358dd3a18f5 100644
 --- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28606,7 +29646,7 @@ index 5731b0403c7f..6358dd3a18f5 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28656,7 +29696,6 @@ index 5731b0403c7f..6358dd3a18f5 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -28794,7 +29833,7 @@ index 5731b0403c7f..6358dd3a18f5 100644
  
  Library("rtc_encoder_simulcast_proxy_gn")
 diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index af943fcca4fa..7c0e72ac5702 100644
+index 2dac02c03b78..d646c162bd84 100644
 --- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28819,7 +29858,7 @@ index af943fcca4fa..7c0e72ac5702 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -48,182 +58,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,181 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28869,7 +29908,6 @@ index af943fcca4fa..7c0e72ac5702 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -29189,7 +30227,7 @@ index 83875d21aec4..f5f9daef4e07 100644
 -
  Library("rtc_media_config_gn")
 diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index f39e77d18a3f..288ff0182765 100644
+index 204b7e3ba39d..288ff0182765 100644
 --- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29214,7 +30252,7 @@ index f39e77d18a3f..288ff0182765 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29264,7 +30302,6 @@ index f39e77d18a3f..288ff0182765 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -29401,6 +30438,370 @@ index f39e77d18a3f..288ff0182765 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("rtc_simulcast_encoder_adapter_gn")
+diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build
+index bf9d15d19351..2078e36a102c 100644
+--- third_party/libwebrtc/media/rtp_utils_gn/moz.build
++++ third_party/libwebrtc/media/rtp_utils_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -39,153 +49,15 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("rtp_utils_gn")
+diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build
+index eeae95fb92bb..88cba2da6736 100644
+--- third_party/libwebrtc/media/stream_params_gn/moz.build
++++ third_party/libwebrtc/media/stream_params_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -39,153 +49,15 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("stream_params_gn")
 diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
 index 2b7ca3a3e87e..7d07c1492b6f 100644
 --- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
@@ -47952,7 +49353,7 @@ index 3188f9057cf4..3d4123fe9245 100644
  
  Library("vad_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index c0ad51eb09c7..70906ddfce2b 100644
+index b4738197183c..70906ddfce2b 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"
@@ -47977,7 +49378,7 @@ index c0ad51eb09c7..70906ddfce2b 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -45,182 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47997,7 +49398,6 @@ index c0ad51eb09c7..70906ddfce2b 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -48027,7 +49427,6 @@ index c0ad51eb09c7..70906ddfce2b 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -48369,7 +49768,7 @@ index 673e3b28ebc0..18ef7216ba3d 100644
  
  Library("alr_detector_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index a43ad620714c..d549b16faaf1 100644
+index 0a7053cdc2b5..d549b16faaf1 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"
@@ -48394,7 +49793,7 @@ index a43ad620714c..d549b16faaf1 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -45,182 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48414,7 +49813,6 @@ index a43ad620714c..d549b16faaf1 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -48444,7 +49842,6 @@ index a43ad620714c..d549b16faaf1 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -48582,7 +49979,7 @@ index a43ad620714c..d549b16faaf1 100644
  
  Library("delay_based_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index 4d4e6f3a8815..a37a5a617b4d 100644
+index a75ba289fcc7..a37a5a617b4d 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"
@@ -48607,7 +50004,7 @@ index 4d4e6f3a8815..a37a5a617b4d 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -49,182 +59,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,180 +59,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48627,7 +50024,6 @@ index 4d4e6f3a8815..a37a5a617b4d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -48657,7 +50053,6 @@ index 4d4e6f3a8815..a37a5a617b4d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -48795,7 +50190,7 @@ index 4d4e6f3a8815..a37a5a617b4d 100644
  
  Library("estimators_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index 9c0a23dfdd4e..7dd9df879aeb 100644
+index 5a9a2ff159d1..7dd9df879aeb 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"
@@ -48820,7 +50215,7 @@ index 9c0a23dfdd4e..7dd9df879aeb 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,182 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48840,7 +50235,6 @@ index 9c0a23dfdd4e..7dd9df879aeb 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -48870,7 +50264,6 @@ index 9c0a23dfdd4e..7dd9df879aeb 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -49412,7 +50805,7 @@ index 732cde0d287a..7c6165c9f66e 100644
  
  Library("loss_based_bwe_v1_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index 86458d9c8507..86e6866b12ac 100644
+index 16329ffec572..86e6866b12ac 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -49437,7 +50830,7 @@ index 86458d9c8507..86e6866b12ac 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49457,7 +50850,6 @@ index 86458d9c8507..86e6866b12ac 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -49487,7 +50879,6 @@ index 86458d9c8507..86e6866b12ac 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -50033,7 +51424,7 @@ index cfea95b862f8..7416b13f0eb1 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 11009fa15dd4..1e2eae1bb0e5 100644
+index e5085dddc7cc..1e2eae1bb0e5 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"
@@ -50058,7 +51449,7 @@ index 11009fa15dd4..1e2eae1bb0e5 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,182 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50078,7 +51469,6 @@ index 11009fa15dd4..1e2eae1bb0e5 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -50108,7 +51498,6 @@ index 11009fa15dd4..1e2eae1bb0e5 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -50246,7 +51635,7 @@ index 11009fa15dd4..1e2eae1bb0e5 100644
  
  Library("send_side_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index 139995ca1c75..e107dc439687 100644
+index 0f02a2523d3e..e107dc439687 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50271,7 +51660,7 @@ index 139995ca1c75..e107dc439687 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50291,7 +51680,6 @@ index 139995ca1c75..e107dc439687 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -50321,7 +51709,6 @@ index 139995ca1c75..e107dc439687 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -50459,7 +51846,7 @@ index 139995ca1c75..e107dc439687 100644
  
  Library("control_handler_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index b29b60b545f8..bf4b7fa514e1 100644
+index f8225bdb6ab2..bf4b7fa514e1 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50484,7 +51871,7 @@ index b29b60b545f8..bf4b7fa514e1 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,182 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50504,7 +51891,6 @@ index b29b60b545f8..bf4b7fa514e1 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -50534,7 +51920,6 @@ index b29b60b545f8..bf4b7fa514e1 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -52299,7 +53684,7 @@ index 27033613552f..0aeb0b97b0db 100644
  
  Library("interval_budget_gn")
 diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index db1a310ba24d..010c64914b95 100644
+index 49d5881a3b37..010c64914b95 100644
 --- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52324,7 +53709,7 @@ index db1a310ba24d..010c64914b95 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -50,182 +60,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,180 +60,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52344,7 +53729,6 @@ index db1a310ba24d..010c64914b95 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -52374,7 +53758,6 @@ index db1a310ba24d..010c64914b95 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -52617,7 +54000,7 @@ index 92ca36986be3..000000000000
 -
 -Library("portal_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 05107ad42bf7..2b57d98d8ea4 100644
+index b34f8e90cf4f..2b57d98d8ea4 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"
@@ -52642,7 +54025,7 @@ index 05107ad42bf7..2b57d98d8ea4 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -55,182 +65,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,180 +65,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52662,7 +54045,6 @@ index 05107ad42bf7..2b57d98d8ea4 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -52692,7 +54074,6 @@ index 05107ad42bf7..2b57d98d8ea4 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -52829,8 +54210,204 @@ index 05107ad42bf7..2b57d98d8ea4 100644
 +    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 cddca5d2a61f..1eb46e1cd668 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"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_AVX2"] = 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 = "webrtc"
+ 
+@@ -43,165 +53,21 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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 770297f7ee4d..6ed3a251e50c 100644
+index 67966cf7a9e3..6ed3a251e50c 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()
@@ -52855,7 +54432,7 @@ index 770297f7ee4d..6ed3a251e50c 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -85,182 +95,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -85,180 +95,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52875,7 +54452,6 @@ index 770297f7ee4d..6ed3a251e50c 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -52905,7 +54481,6 @@ index 770297f7ee4d..6ed3a251e50c 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -53043,7 +54618,7 @@ index 770297f7ee4d..6ed3a251e50c 100644
  
  Library("rtp_rtcp_format_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index cd2ea6c1a35a..e9342cc76a40 100644
+index 545b4d32c1d9..e9342cc76a40 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"
@@ -53068,7 +54643,7 @@ index cd2ea6c1a35a..e9342cc76a40 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -95,182 +105,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -95,180 +105,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53088,7 +54663,6 @@ index cd2ea6c1a35a..e9342cc76a40 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -53118,7 +54692,6 @@ index cd2ea6c1a35a..e9342cc76a40 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -54256,7 +55829,7 @@ index 0046075b68b4..8d216e646134 100644
  
  Library("utility_gn")
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index 6c0491df9858..a6ab11c23960 100644
+index 0efb49460601..a6ab11c23960 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
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -54295,7 +55868,7 @@ index 6c0491df9858..a6ab11c23960 100644
  if not CONFIG["MOZ_DEBUG"]:
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -39,207 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,206 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54345,7 +55918,6 @@ index 6c0491df9858..a6ab11c23960 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -54508,7 +56080,7 @@ index 6c0491df9858..a6ab11c23960 100644
  
  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 244affb99596..0a6357828748 100644
+index e1a77c54b7e9..0a6357828748 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()
@@ -54533,7 +56105,7 @@ index 244affb99596..0a6357828748 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -47,182 +57,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,181 +57,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54583,7 +56155,6 @@ index 244affb99596..0a6357828748 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -55315,7 +56886,7 @@ index bae653022f52..2d7f0877da4f 100644
  
  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 8bbdb4762c45..4357aaf03f6d 100644
+index 6e56cb813409..4357aaf03f6d 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()
@@ -55340,7 +56911,7 @@ index 8bbdb4762c45..4357aaf03f6d 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55360,7 +56931,6 @@ index 8bbdb4762c45..4357aaf03f6d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -55390,7 +56960,6 @@ index 8bbdb4762c45..4357aaf03f6d 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -55732,7 +57301,7 @@ index ab6b014f62c1..a6a0b783342e 100644
  
  Library("frame_dependencies_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index fd787283158f..97c33c3db1d0 100644
+index ed5b1bdf6b27..97c33c3db1d0 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()
@@ -55757,7 +57326,7 @@ index fd787283158f..97c33c3db1d0 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55777,7 +57346,6 @@ index fd787283158f..97c33c3db1d0 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -55807,7 +57375,6 @@ index fd787283158f..97c33c3db1d0 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -56156,7 +57723,7 @@ index 5a1af2206d9e..6aba10d80f6a 100644
  
  Library("nack_requester_gn")
 diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index 209b31a89ef0..713c12629daa 100644
+index d5fa516bf494..713c12629daa 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()
@@ -56181,7 +57748,7 @@ index 209b31a89ef0..713c12629daa 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56201,7 +57768,6 @@ index 209b31a89ef0..713c12629daa 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -56231,7 +57797,6 @@ index 209b31a89ef0..713c12629daa 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -57781,7 +59346,7 @@ index ad375d8f04c4..f41b3bb7a842 100644
  
  Library("inter_frame_delay_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 bc41a3fa841c..e784c7b6eceb 100644
+index 2fce89e85571..e784c7b6eceb 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()
@@ -57806,7 +59371,7 @@ index bc41a3fa841c..e784c7b6eceb 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57826,7 +59391,6 @@ index bc41a3fa841c..e784c7b6eceb 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -57856,7 +59420,6 @@ index bc41a3fa841c..e784c7b6eceb 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -58605,7 +60168,7 @@ index 6c5bddfa28e4..4bdcc798300e 100644
  
  Library("timing_module_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index 6cea30b22b65..a43d3b87df85 100644
+index 9b89c3175ffd..a43d3b87df85 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()
@@ -58630,7 +60193,7 @@ index 6cea30b22b65..a43d3b87df85 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,182 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58650,7 +60213,6 @@ index 6cea30b22b65..a43d3b87df85 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -58679,11 +60241,6 @@ index 6cea30b22b65..a43d3b87df85 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -58726,9 +60283,6 @@ index 6cea30b22b65..a43d3b87df85 100644
 -    DEFINES["__STD_C"] = True
 -
 -    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
 -        "winmm"
 -    ]
 +    DEFINES["_DEBUG"] = True
@@ -58808,17 +60362,17 @@ index 6cea30b22b65..a43d3b87df85 100644
  
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
  
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 97fa34f7590a..f2f678fb0d1e 100644
+index 18ab528a5a35..f2f678fb0d1e 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()
@@ -58843,7 +60397,7 @@ index 97fa34f7590a..f2f678fb0d1e 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -59,182 +69,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,181 +69,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58893,7 +60447,6 @@ index 97fa34f7590a..f2f678fb0d1e 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -59031,7 +60584,7 @@ index 97fa34f7590a..f2f678fb0d1e 100644
  
  Library("video_coding_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index 054578c195b2..deedbe512b88 100644
+index ab7dafa925ce..deedbe512b88 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()
@@ -59056,7 +60609,7 @@ index 054578c195b2..deedbe512b88 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -54,182 +64,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,180 +64,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59076,7 +60629,6 @@ index 054578c195b2..deedbe512b88 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -59106,7 +60658,6 @@ index 054578c195b2..deedbe512b88 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -59444,7 +60995,7 @@ index a31368bc624d..537f3d9fe0f5 100644
  
  Library("webrtc_libvpx_interface_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index 8420cc5886ed..92b1a296d219 100644
+index 5047b3580bab..92b1a296d219 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59469,7 +61020,7 @@ index 8420cc5886ed..92b1a296d219 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -46,182 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,180 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59489,7 +61040,6 @@ index 8420cc5886ed..92b1a296d219 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -59519,7 +61069,6 @@ index 8420cc5886ed..92b1a296d219 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -59857,7 +61406,7 @@ index f05efa9f5bb9..fb174b5b0de7 100644
  
  Library("webrtc_vp8_scalability_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index 79ee3b41cf4b..faf71b356c4f 100644
+index a0dc50088a1f..faf71b356c4f 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()
@@ -59882,7 +61431,7 @@ index 79ee3b41cf4b..faf71b356c4f 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -48,182 +58,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,180 +58,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59902,7 +61451,6 @@ index 79ee3b41cf4b..faf71b356c4f 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -59932,7 +61480,6 @@ index 79ee3b41cf4b..faf71b356c4f 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -60070,7 +61617,7 @@ index 79ee3b41cf4b..faf71b356c4f 100644
  
  Library("webrtc_vp8_temporal_layers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index 6a314dd2a754..bc5984be48f6 100644
+index d044446ea180..bc5984be48f6 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60095,7 +61642,7 @@ index 6a314dd2a754..bc5984be48f6 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -48,182 +58,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,181 +58,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60145,7 +61692,6 @@ index 6a314dd2a754..bc5984be48f6 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -60283,7 +61829,7 @@ index 6a314dd2a754..bc5984be48f6 100644
  
  Library("webrtc_vp9_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index 0c9182dc77ca..1680842fab69 100644
+index 48aba2c13119..1680842fab69 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()
@@ -60308,7 +61854,7 @@ index 0c9182dc77ca..1680842fab69 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60358,7 +61904,6 @@ index 0c9182dc77ca..1680842fab69 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -60496,10 +62041,10 @@ index 0c9182dc77ca..1680842fab69 100644
  
  Library("webrtc_vp9_helpers_gn")
 diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index 976cf373047c..7e74ae296d7a 100644
+index 09cc9769bf1e..7579b40c86b7 100644
 --- third_party/libwebrtc/moz.build
 +++ third_party/libwebrtc/moz.build
-@@ -254,6 +254,8 @@ DIRS += [
+@@ -262,6 +262,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",
@@ -60508,7 +62053,7 @@ index 976cf373047c..7e74ae296d7a 100644
      "/third_party/libwebrtc/modules/module_api_gn",
      "/third_party/libwebrtc/modules/module_api_public_gn",
      "/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -448,183 +450,14 @@ DIRS += [
+@@ -456,183 +458,14 @@ DIRS += [
      "/third_party/libwebrtc/webrtc_gn"
  ]
  
@@ -60694,7 +62239,7 @@ index 976cf373047c..7e74ae296d7a 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -634,7 +467,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
+@@ -642,7 +475,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
          "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn"
      ]
  
@@ -60703,10 +62248,10 @@ index 976cf373047c..7e74ae296d7a 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-diff --git third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-index aabb47219565..dca18c885b81 100644
---- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
+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 d30e26fa8e66..384b3d8d2a9b 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
@@ -60729,7 +62274,7 @@ index aabb47219565..dca18c885b81 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60748,11 +62293,6 @@ index aabb47219565..dca18c885b81 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "GLESv2",
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -60818,13 +62358,6 @@ index aabb47219565..dca18c885b81 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -60834,10 +62367,6 @@ index aabb47219565..dca18c885b81 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -60863,9 +62392,10 @@ index aabb47219565..dca18c885b81 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -60875,10 +62405,6 @@ index aabb47219565..dca18c885b81 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -60894,27 +62420,20 @@ index aabb47219565..dca18c885b81 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["USE_X11"] = "1"
- 
- Library("async_resolver_interface_gn")
-diff --git third_party/libwebrtc/rtc_base/async_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
-index e7114fbe5eb7..2da12b3c2366 100644
---- third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
+-
+ Library("async_packet_socket_gn")
+diff --git third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
+index aabb47219565..dca18c885b81 100644
+--- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
++++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -61118,7 +62637,7 @@ index e7114fbe5eb7..2da12b3c2366 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("async_socket_gn")
+ Library("async_resolver_interface_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 a5707fbf2ab8..e98dc056eaa4 100644
 --- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
@@ -62291,10 +63810,10 @@ index 2ad50e863646..9ae8d977aa36 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("byte_order_gn")
-diff --git third_party/libwebrtc/rtc_base/callback_list_gn/moz.build third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
-index b2cf817a3a5b..3dee3e989adb 100644
---- third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
+diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
+index dcf6c9a72b80..fdbaad2e302a 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
@@ -62490,11 +64009,11 @@ index b2cf817a3a5b..3dee3e989adb 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("callback_list_gn")
-diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index dcf6c9a72b80..fdbaad2e302a 100644
---- third_party/libwebrtc/rtc_base/checks_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
+ 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 c903e8d34926..cb62ac34dba9 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
@@ -62517,7 +64036,7 @@ index dcf6c9a72b80..fdbaad2e302a 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62536,10 +64055,6 @@ index dcf6c9a72b80..fdbaad2e302a 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -62614,10 +64129,6 @@ index dcf6c9a72b80..fdbaad2e302a 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -62643,9 +64154,10 @@ index dcf6c9a72b80..fdbaad2e302a 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -62655,10 +64167,6 @@ index dcf6c9a72b80..fdbaad2e302a 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -62674,27 +64182,20 @@ index dcf6c9a72b80..fdbaad2e302a 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 c903e8d34926..cb62ac34dba9 100644
---- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/compile_assert_c_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 87795114516e..d07291bee8dc 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
@@ -62717,7 +64218,7 @@ index c903e8d34926..cb62ac34dba9 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62736,6 +64237,10 @@ index c903e8d34926..cb62ac34dba9 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -62810,6 +64315,10 @@ index c903e8d34926..cb62ac34dba9 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -62835,10 +64344,9 @@ index c903e8d34926..cb62ac34dba9 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -62848,6 +64356,10 @@ index c903e8d34926..cb62ac34dba9 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -62863,20 +64375,27 @@ index c903e8d34926..cb62ac34dba9 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 87795114516e..d07291bee8dc 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
++    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 1036d523dd33..52b9dc5b22ed 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
@@ -62899,7 +64418,7 @@ index 87795114516e..d07291bee8dc 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62996,10 +64515,6 @@ index 87795114516e..d07291bee8dc 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -63025,9 +64540,10 @@ index 87795114516e..d07291bee8dc 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -63037,10 +64553,6 @@ index 87795114516e..d07291bee8dc 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -63056,27 +64568,20 @@ index 87795114516e..d07291bee8dc 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 1036d523dd33..52b9dc5b22ed 100644
---- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/containers/flat_map_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 d8b47b1b19d6..183b743e4ec4 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
@@ -63258,11 +64763,11 @@ index 1036d523dd33..52b9dc5b22ed 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 d8b47b1b19d6..183b743e4ec4 100644
---- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/containers/flat_set_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 0c7c0a7cf358..76cbb5e87ae4 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
@@ -63285,7 +64790,7 @@ index d8b47b1b19d6..183b743e4ec4 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63382,6 +64887,10 @@ index d8b47b1b19d6..183b743e4ec4 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -63407,10 +64916,9 @@ index d8b47b1b19d6..183b743e4ec4 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -63420,6 +64928,10 @@ index d8b47b1b19d6..183b743e4ec4 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -63435,20 +64947,27 @@ index d8b47b1b19d6..183b743e4ec4 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 0c7c0a7cf358..76cbb5e87ae4 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("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 4302740a4b6e..ee45b4a941f8 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
@@ -63644,11 +65163,11 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644
 -    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 4302740a4b6e..ee45b4a941f8 100644
---- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/criticalsection_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 7e9cafaef90a..0cc5d1ab0025 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
@@ -63671,7 +65190,7 @@ index 4302740a4b6e..ee45b4a941f8 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63768,10 +65287,6 @@ index 4302740a4b6e..ee45b4a941f8 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -63797,9 +65312,10 @@ index 4302740a4b6e..ee45b4a941f8 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -63809,10 +65325,6 @@ index 4302740a4b6e..ee45b4a941f8 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -63828,27 +65340,20 @@ index 4302740a4b6e..ee45b4a941f8 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 7e9cafaef90a..0cc5d1ab0025 100644
---- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/divide_round_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 c22225093c2b..9d6c7a641c84 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
@@ -63871,7 +65376,7 @@ index 7e9cafaef90a..0cc5d1ab0025 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63890,10 +65395,6 @@ index 7e9cafaef90a..0cc5d1ab0025 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -64030,7 +65531,7 @@ index 7e9cafaef90a..0cc5d1ab0025 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("divide_round_gn")
+ 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 542f74d16c00..4baf2304eb8c 100644
 --- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
@@ -68753,10 +70254,10 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("aligned_malloc_gn")
-diff --git third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build
-index dc9deaa596d0..5da85cf5d207 100644
---- third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build
+diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+index c7d0b157f2b0..34f9ab7b377d 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
@@ -68938,11 +70439,11 @@ index dc9deaa596d0..5da85cf5d207 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("always_valid_pointer_gn")
-diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index c7d0b157f2b0..34f9ab7b377d 100644
---- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/mod_ops_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 7d3b2054e22a..26e19f66e101 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
@@ -69124,11 +70625,11 @@ index c7d0b157f2b0..34f9ab7b377d 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 7d3b2054e22a..26e19f66e101 100644
---- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/moving_max_counter_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 ba1806bcc3ba..359e190aeafa 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
@@ -69151,7 +70652,7 @@ index 7d3b2054e22a..26e19f66e101 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69171,6 +70672,7 @@ index 7d3b2054e22a..26e19f66e101 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "GLESv2",
 -        "log"
 -    ]
 -
@@ -69239,6 +70741,13 @@ index 7d3b2054e22a..26e19f66e101 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -69248,6 +70757,10 @@ index 7d3b2054e22a..26e19f66e101 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -69273,10 +70786,9 @@ index 7d3b2054e22a..26e19f66e101 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -69286,6 +70798,10 @@ index 7d3b2054e22a..26e19f66e101 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -69301,20 +70817,27 @@ index 7d3b2054e22a..26e19f66e101 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 ba1806bcc3ba..359e190aeafa 100644
---- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("net_helpers_gn")
+diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
+index ef67f998ceaf..2d18d069dad1 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
@@ -69337,7 +70860,7 @@ index ba1806bcc3ba..359e190aeafa 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69356,11 +70879,6 @@ index ba1806bcc3ba..359e190aeafa 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "GLESv2",
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69426,13 +70944,6 @@ index ba1806bcc3ba..359e190aeafa 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -69482,11 +70993,12 @@ index ba1806bcc3ba..359e190aeafa 100644
 -    ]
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -69495,34 +71007,33 @@ index ba1806bcc3ba..359e190aeafa 100644
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("net_helpers_gn")
-diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index ef67f998ceaf..2d18d069dad1 100644
---- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/network/sent_packet_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 e9bde339c23d..228d4bbdc472 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
@@ -69545,7 +71056,7 @@ index ef67f998ceaf..2d18d069dad1 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69564,6 +71075,10 @@ index ef67f998ceaf..2d18d069dad1 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -69678,12 +71193,11 @@ index ef67f998ceaf..2d18d069dad1 100644
 -    ]
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -69692,33 +71206,34 @@ index ef67f998ceaf..2d18d069dad1 100644
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+ 
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    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 e9bde339c23d..228d4bbdc472 100644
---- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/network_constants_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 d0ae8c516228..17315b6e9333 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
@@ -69914,7 +71429,7 @@ index e9bde339c23d..228d4bbdc472 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("network_constants_gn")
+ 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 03308e7c471e..354fd3141771 100644
 --- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
@@ -72096,10 +73611,10 @@ index 25f3a388bd6d..982c7f0082fb 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("refcount_gn")
-diff --git third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-index 81d034b40389..aa45774d4b36 100644
---- third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
+diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
+index a61cb1ba3e8b..92ae8a2096e9 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
@@ -72122,15 +73637,7 @@ index 81d034b40389..aa45774d4b36 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -35,6 +45,7 @@ UNIFIED_SOURCES += [
-     "/third_party/libwebrtc/rtc_base/crypt_string.cc",
-     "/third_party/libwebrtc/rtc_base/data_rate_limiter.cc",
-     "/third_party/libwebrtc/rtc_base/file_rotating_stream.cc",
-+    "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc",
-     "/third_party/libwebrtc/rtc_base/log_sinks.cc",
-     "/third_party/libwebrtc/rtc_base/network_route.cc",
-     "/third_party/libwebrtc/rtc_base/stream.cc"
-@@ -49,199 +60,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72150,14 +73657,9 @@ index 81d034b40389..aa45774d4b36 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
--    UNIFIED_SOURCES += [
--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -72168,11 +73670,6 @@ index 81d034b40389..aa45774d4b36 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    UNIFIED_SOURCES += [
--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc",
--        "/third_party/libwebrtc/rtc_base/mac_ifaddrs_converter.cc"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["USE_AURA"] = "1"
@@ -72188,15 +73685,6 @@ index 81d034b40389..aa45774d4b36 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
--    UNIFIED_SOURCES += [
--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -72211,10 +73699,6 @@ index 81d034b40389..aa45774d4b36 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    UNIFIED_SOURCES += [
--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
--    ]
--
 -if CONFIG["OS_TARGET"] == "WINNT":
 -
 -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@@ -72241,13 +73725,6 @@ index 81d034b40389..aa45774d4b36 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -72257,10 +73734,6 @@ index 81d034b40389..aa45774d4b36 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -72286,9 +73759,10 @@ index 81d034b40389..aa45774d4b36 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 -
 -    OS_LIBS += [
@@ -72298,10 +73772,6 @@ index 81d034b40389..aa45774d4b36 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    OS_LIBS += [
 -        "android_support"
 -    ]
@@ -72317,23 +73787,16 @@ index 81d034b40389..aa45774d4b36 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["USE_X11"] = "1"
- 
- Library("rtc_base_gn")
+-
+ 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 d7651183047b..9322f99f1130 100644
 --- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
@@ -74678,6 +76141,188 @@ index 1d28df20e152..b5b51947b10f 100644
 -    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 35975c3cb69f..87ed0e9ea41b 100644
+--- third_party/libwebrtc/rtc_base/ssl_gn/moz.build
++++ third_party/libwebrtc/rtc_base/ssl_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_AVX2"] = 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 = "webrtc"
+ 
+@@ -39,153 +49,15 @@ 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_AVX2"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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_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_AVX2"] = 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["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+-    OS_LIBS += [
+-        "android_support"
+-    ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-    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 fc552833c01c..f86ec669c404 100644
 --- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
@@ -76115,188 +77760,6 @@ index 9425e8825167..000000000000
 -    DEFINES["USE_X11"] = "1"
 -
 -Library("asm_defines_gn")
-diff --git third_party/libwebrtc/rtc_base/system/assume_gn/moz.build third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
-index 85be2c443290..f8c8b987d6f0 100644
---- third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/system/assume_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_AVX2"] = 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 = "webrtc"
- 
-@@ -39,153 +49,15 @@ 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_AVX2"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--    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_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_AVX2"] = 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["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--    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["CPU_ARCH"] == "aarch64":
- 
-     DEFINES["WEBRTC_ARCH_ARM64"] = True
-     DEFINES["WEBRTC_HAS_NEON"] = True
- 
--if CONFIG["CPU_ARCH"] == "arm":
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
--
--    OS_LIBS += [
--        "android_support",
--        "unwind"
--    ]
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
--
--    OS_LIBS += [
--        "android_support"
--    ]
--
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
- Library("assume_gn")
 diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
 deleted file mode 100644
 index 8bbe2b95100c..000000000000
@@ -78931,10 +80394,10 @@ index b67ac0fb9ff3..dd83f85e664e 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("type_traits_gn")
-diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-index ebce9e1aff3d..9c2956925f04 100644
---- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
+diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
+index 9382cf752652..bd5d3a073fc0 100644
+--- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
++++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -78957,7 +80420,7 @@ index ebce9e1aff3d..9c2956925f04 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78976,10 +80439,6 @@ index ebce9e1aff3d..9c2956925f04 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79116,11 +80575,11 @@ index ebce9e1aff3d..9c2956925f04 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("unit_base_gn")
-diff --git third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
-index 502c627f49e1..485285e043ae 100644
---- third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
+ Library("unique_id_generator_gn")
+diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
+index ebce9e1aff3d..9c2956925f04 100644
+--- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
++++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -79143,7 +80602,7 @@ index 502c627f49e1..485285e043ae 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79162,6 +80621,10 @@ index 502c627f49e1..485285e043ae 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -79298,7 +80761,7 @@ index 502c627f49e1..485285e043ae 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("untyped_function_gn")
+ Library("unit_base_gn")
 diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
 index 895ce10d8d1d..6962ab6543ba 100644
 --- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
@@ -81258,7 +82721,7 @@ index 75df83a0ce58..b9dd43747840 100644
  
  Library("system_wrappers_gn")
 diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-index 21f03539e809..adae028f86db 100644
+index c02fce36c9a3..adae028f86db 100644
 --- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 +++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81283,7 +82746,7 @@ index 21f03539e809..adae028f86db 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81303,7 +82766,6 @@ index 21f03539e809..adae028f86db 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -81333,7 +82795,6 @@ index 21f03539e809..adae028f86db 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -83112,140 +84573,6 @@ index 36c768828745..38403c4daf5f 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("compressed_tuple_gn")
-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
-index cd500dc5e155..20ebcc550cb1 100644
---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
-@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
- 
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
- 
- FINAL_LIBRARY = "webrtc"
- 
-@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
--
--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["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_X11"] = "1"
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["__STD_C"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
--
--    OS_LIBS += [
--        "android_support",
--        "unwind"
--    ]
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
--
--    OS_LIBS += [
--        "android_support"
--    ]
--
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_GNU_SOURCE"] = True
--
- Library("flat_hash_map_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
 index d92dcd18e347..f3c3c2ec8183 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
@@ -86151,7 +87478,7 @@ index bac3c415a85e..087012313675 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 b25ef5f11774..a45836895947 100644
+index cdf3afe0d5e8..a45836895947 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()
@@ -86176,7 +87503,7 @@ index b25ef5f11774..a45836895947 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -52,182 +62,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,180 +62,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86196,7 +87523,6 @@ index b25ef5f11774..a45836895947 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -86226,7 +87552,6 @@ index b25ef5f11774..a45836895947 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -86568,7 +87893,7 @@ index a187c3b980f8..622de274f1e1 100644
  
  Library("encoder_config_gn")
 diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
-index 70625392a343..0c39c898cc2e 100644
+index 4fbb1154de19..0c39c898cc2e 100644
 --- third_party/libwebrtc/video/config/streams_config_gn/moz.build
 +++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -86593,7 +87918,7 @@ index 70625392a343..0c39c898cc2e 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -44,182 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,181 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86643,7 +87968,6 @@ index 70625392a343..0c39c898cc2e 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -87611,7 +88935,7 @@ index 769cdf016940..a4a3704fca3a 100644
  
  Library("frame_decode_timing_gn")
 diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-index 0f683057ceb4..ad81223fd405 100644
+index 47324d172dee..ad81223fd405 100644
 --- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87636,7 +88960,7 @@ index 0f683057ceb4..ad81223fd405 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87686,7 +89010,6 @@ index 0f683057ceb4..ad81223fd405 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -88639,7 +89962,7 @@ index 56b5fd181389..e71b467261f6 100644
  
  Library("unique_timestamp_counter_gn")
 diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
-index ca94b278fbde..5f87c7f5a820 100644
+index 339c0caed506..5f87c7f5a820 100644
 --- third_party/libwebrtc/video/video_gn/moz.build
 +++ third_party/libwebrtc/video/video_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -88664,7 +89987,7 @@ index ca94b278fbde..5f87c7f5a820 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -65,182 +75,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -65,181 +75,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88714,7 +90037,6 @@ index ca94b278fbde..5f87c7f5a820 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -89063,7 +90385,7 @@ index 243f97516367..cdce52b65cca 100644
  
  Library("video_receive_stream_timeout_tracker_gn")
 diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-index 8de6c8489058..56a5cb95759b 100644
+index c123026e4887..56a5cb95759b 100644
 --- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -89088,7 +90410,7 @@ index 8de6c8489058..56a5cb95759b 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89138,7 +90460,6 @@ index 8de6c8489058..56a5cb95759b 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -89276,7 +90597,7 @@ index 8de6c8489058..56a5cb95759b 100644
  
  Library("video_stream_buffer_controller_gn")
 diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-index 45655f5993c4..f0ea0f8bcdb3 100644
+index a1f47fa9f9f5..f0ea0f8bcdb3 100644
 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -89301,7 +90622,7 @@ index 45655f5993c4..f0ea0f8bcdb3 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -48,182 +58,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,181 +58,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89351,7 +90672,6 @@ index 45655f5993c4..f0ea0f8bcdb3 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -89679,7 +90999,7 @@ index 0e5a20b2d558..8f98c5d580a3 100644
 -
  Library("video_stream_encoder_interface_gn")
 diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index 55364f4fffe2..d905c264b009 100644
+index 9a853f620964..d905c264b009 100644
 --- third_party/libwebrtc/webrtc_gn/moz.build
 +++ third_party/libwebrtc/webrtc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -89704,7 +91024,7 @@ index 55364f4fffe2..d905c264b009 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -39,158 +49,14 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,14 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89759,7 +91079,6 @@ index 55364f4fffe2..d905c264b009 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "dl",
 -        "rt"
 -    ]
 -
@@ -89865,7 +91184,7 @@ index 55364f4fffe2..d905c264b009 100644
  
      DEFINES["USE_X11"] = "1"
  
-@@ -205,37 +71,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+@@ -204,37 +71,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
          "Xtst"
      ]
author	Christoph Moench-Tegeder <cmt@FreeBSD.org>	2023-06-27 21:13:04 +0000
committer	Christoph Moench-Tegeder <cmt@FreeBSD.org>	2023-06-27 21:13:04 +0000
commit	cc72a4893237befed7f631554f489f72f7f130fb (patch)
tree	6cccb2799d1a122433d3dff417c46cd6ca01631d
parent	d93e409971e167bdad655af3ca8e6ff09a639ee7 (diff)
download	ports-cc72a4893237befed7f631554f489f72f7f130fb.tar.gz ports-cc72a4893237befed7f631554f489f72f7f130fb.zip