aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/firefox-esr/Makefile18
-rw-r--r--www/firefox-esr/distinfo6
-rw-r--r--www/firefox-esr/files/patch-addon-search34
-rw-r--r--www/firefox-esr/files/patch-bug142715210
-rw-r--r--www/firefox-esr/files/patch-bug1504834_comment573
-rw-r--r--www/firefox-esr/files/patch-bug1504834_comment949
-rw-r--r--www/firefox-esr/files/patch-bug155921339
-rw-r--r--www/firefox-esr/files/patch-bug164098215
-rw-r--r--www/firefox-esr/files/patch-bug165961222
-rw-r--r--www/firefox-esr/files/patch-bug1729459_comment1293
-rw-r--r--www/firefox-esr/files/patch-bug84756810
-rw-r--r--www/firefox-esr/files/patch-gfx_skia_skia_src_base_SkEndian.h11
-rw-r--r--www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h11
-rw-r--r--www/firefox-esr/files/patch-i386-protobuf-alignment15
-rw-r--r--www/firefox-esr/files/patch-js_public_Utility.h35
-rw-r--r--www/firefox-esr/files/patch-libwebrtc-generated39764
-rw-r--r--www/firefox-esr/files/patch-modules_fdlibm_src_math__private.h27
-rw-r--r--www/firefox-esr/files/patch-pipewire_init67
-rw-r--r--www/firefox-esr/files/patch-python_mozbuild_mozbuild_gn__processor.py48
-rw-r--r--www/firefox-esr/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn31
-rw-r--r--www/firefox-esr/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc23
-rw-r--r--www/firefox-esr/files/patch-toolkit_xre_glxtest.cpp17
22 files changed, 33064 insertions, 7354 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 415fa4fcf096..9f88f360f1d3 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,9 +1,9 @@
PORTNAME= firefox
-DISTVERSION= 102.15.1
+DISTVERSION= 115.3.0
PORTEPOCH= 1
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
PKGNAMESUFFIX= -esr
DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX}
@@ -12,14 +12,14 @@ 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.79.1:security/nss \
- icu>=71.1,1:devel/icu \
+ nss>=3.90:security/nss \
+ icu>=73.1,1:devel/icu \
libevent>=2.1.8:devel/libevent \
- harfbuzz>=4.1.0:print/harfbuzz \
+ harfbuzz>=7.3.0:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
- png>=1.6.37:graphics/png \
+ png>=1.6.39:graphics/png \
dav1d>=1.0.0:multimedia/dav1d \
- libvpx>=1.11.0:multimedia/libvpx \
+ libvpx>=1.13.0:multimedia/libvpx \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
v4l_compat>0:multimedia/v4l_compat \
autoconf2.13:devel/autoconf2.13 \
@@ -62,10 +62,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp
-pre-configure:
- (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
- (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
-
post-install:
${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 3ae1da28debd..835b06c68bc5 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694536278
-SHA256 (firefox-102.15.1esr.source.tar.xz) = 09194fb765953bc6979a35aa8834118c453b9d6060bf1ec4e134551bad740113
-SIZE (firefox-102.15.1esr.source.tar.xz) = 483198220
+TIMESTAMP = 1695064384
+SHA256 (firefox-115.3.0esr.source.tar.xz) = 8a1dc50b3d81df3b8ee8ef191551a355c9b139f09688a3fb61234b2f6d7670ca
+SIZE (firefox-115.3.0esr.source.tar.xz) = 510157064
diff --git a/www/firefox-esr/files/patch-addon-search b/www/firefox-esr/files/patch-addon-search
index f04e5599bbe7..b6dbf7924b43 100644
--- a/www/firefox-esr/files/patch-addon-search
+++ b/www/firefox-esr/files/patch-addon-search
@@ -2,10 +2,10 @@ 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 75c2c5e435e35..4d8c09c02759b 100644
---- browser/app/profile/firefox.js.orig 2021-11-02 16:33:38.105280000 +0100
-+++ browser/app/profile/firefox.js 2021-11-02 16:37:53.792644000 +0100
-@@ -39,7 +39,7 @@
+index 621900f90fc1..401ef9074bd0 100644
+--- browser/app/profile/firefox.js
++++ browser/app/profile/firefox.js
+@@ -38,7 +38,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true);
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v4/addons/search/?guid=%IDS%&lang=%LOCALE%");
@@ -14,7 +14,7 @@ index 75c2c5e435e35..4d8c09c02759b 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%");
-@@ -206,8 +206,8 @@
+@@ -204,8 +204,8 @@ pref("app.update.langpack.enabled", true);
// .. etc ..
//
pref("extensions.update.enabled", true);
@@ -25,24 +25,24 @@ index 75c2c5e435e35..4d8c09c02759b 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 f70fd8d7e3bd8..81e8cd7764fdf 100644
---- toolkit/mozapps/extensions/internal/AddonRepository.jsm.orig 2021-11-02 16:38:22.800491000 +0100
-+++ toolkit/mozapps/extensions/internal/AddonRepository.jsm 2021-11-02 16:39:24.255593000 +0100
-@@ -584,7 +584,7 @@
+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 == PLATFORM) {
-+ if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) {
+- 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 f70fd8d7e3bd8..81e8cd7764fdf 100644
---- toolkit/mozapps/extensions/internal/XPIDatabase.jsm.orig 2021-11-02 16:39:45.832056000 +0100
-+++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm 2021-11-02 16:40:38.136056000 +0100
-@@ -483,7 +483,7 @@
+index 03186dad43a4..4053fc6f2702 100644
+--- toolkit/mozapps/extensions/internal/XPIDatabase.jsm
++++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+@@ -634,7 +634,7 @@ class AddonInternal {
// Something is causing errors in here
try {
for (let platform of this.targetPlatforms) {
diff --git a/www/firefox-esr/files/patch-bug1427152 b/www/firefox-esr/files/patch-bug1427152
new file mode 100644
index 000000000000..49bd5a581ac8
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug1427152
@@ -0,0 +1,10 @@
+--- modules/libpref/Preferences.cpp.orig 2023-05-11 21:42:41 UTC
++++ modules/libpref/Preferences.cpp
+@@ -6126,6 +6126,7 @@ static const PrefListEntry sDynamicPrefOverrideList[]{
+ PREF_LIST_ENTRY("logging.config.LOG_FILE"),
+ PREF_LIST_ENTRY("media.audio_loopback_dev"),
+ PREF_LIST_ENTRY("media.decoder-doctor."),
++ PREF_LIST_ENTRY("media.cubeb.backend"),
+ PREF_LIST_ENTRY("media.cubeb.output_device"),
+ PREF_LIST_ENTRY("media.getusermedia.fake-camera-name"),
+ PREF_LIST_ENTRY("media.hls.server.url"),
diff --git a/www/firefox-esr/files/patch-bug1504834_comment5 b/www/firefox-esr/files/patch-bug1504834_comment5
index db2663ccfb34..b9897e0b7f66 100644
--- a/www/firefox-esr/files/patch-bug1504834_comment5
+++ b/www/firefox-esr/files/patch-bug1504834_comment5
@@ -3,9 +3,42 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600
Rough progress patch
-diff -r 53107afbc21e gfx/skia/skia/third_party/skcms/skcms.cc
---- gfx/skia/skia/third_party/skcms/skcms.cc Wed Nov 07 04:50:21 2018 +0000
-+++ gfx/skia/skia/third_party/skcms/skcms.cc Thu Nov 29 12:49:35 2018 +0000
+diff --git gfx/2d/DrawTargetSkia.cpp gfx/2d/DrawTargetSkia.cpp
+index 6bbef8d..82b04ba 100644
+--- gfx/2d/DrawTargetSkia.cpp
++++ gfx/2d/DrawTargetSkia.cpp
+@@ -154,8 +154,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& aSize, const Rect* aBounds,
+ return surfaceBounds.Intersect(bounds);
+ }
+
+-static const int kARGBAlphaOffset =
+- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
++static const int kARGBAlphaOffset = 0;
+
+ static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
+ const int32_t aStride, SurfaceFormat aFormat) {
+diff --git gfx/2d/Types.h gfx/2d/Types.h
+index 6b3bdc7..7c6c342 100644
+--- gfx/2d/Types.h
++++ gfx/2d/Types.h
+@@ -90,15 +90,8 @@ enum class SurfaceFormat : int8_t {
+ // The following values are endian-independent synonyms. The _UINT32 suffix
+ // indicates that the name reflects the layout when viewed as a uint32_t
+ // value.
+-#if MOZ_LITTLE_ENDIAN()
+ A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
+ X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
+-#elif MOZ_BIG_ENDIAN()
+- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
+- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
+-#else
+-# error "bad endianness"
+-#endif
+
+ // The following values are OS and endian-independent synonyms.
+ //
+--- gfx/skia/skia/modules/skcms/skcms.cc.orig
++++ gfx/skia/skia/modules/skcms/skcms.cc
@@ -30,6 +30,8 @@
#include <avx512fintrin.h>
#include <avx512dqintrin.h>
@@ -14,8 +47,8 @@ diff -r 53107afbc21e gfx/skia/skia/third_party/skcms/skcms.cc
+ #define SKCMS_PORTABLE
#endif
- // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
+ static bool runtime_cpu_detection = true;
+@@ -324,20 +326,28 @@
static uint16_t read_big_u16(const uint8_t* ptr) {
uint16_t be;
memcpy(&be, ptr, sizeof(be));
@@ -48,33 +81,3 @@ diff -r 53107afbc21e gfx/skia/skia/third_party/skcms/skcms.cc
#endif
}
---- gfx/2d/DrawTargetSkia.cpp.orig 2019-09-21 15:51:04.129603000 +0200
-+++ gfx/2d/DrawTargetSkia.cpp 2019-09-21 15:52:11.900316000 +0200
-@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
- return surfaceBounds.Intersect(bounds);
- }
-
--static const int kARGBAlphaOffset =
-- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;
-
- static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
- const int32_t aStride, SurfaceFormat aFormat) {
---- gfx/2d/Types.h.orig 2019-09-21 15:52:47.044803000 +0200
-+++ gfx/2d/Types.h 2019-09-21 15:53:40.113641000 +0200
-@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
--#if MOZ_LITTLE_ENDIAN()
- A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
- X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
--#elif MOZ_BIG_ENDIAN()
-- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
-- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
--#else
--# error "bad endianness"
--#endif
-
- // The following values are OS and endian-independent synonyms.
- //
diff --git a/www/firefox-esr/files/patch-bug1504834_comment9 b/www/firefox-esr/files/patch-bug1504834_comment9
deleted file mode 100644
index c3d149ffa37b..000000000000
--- a/www/firefox-esr/files/patch-bug1504834_comment9
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c9
-https://bugzilla.mozilla.org/attachment.cgi?id=9111146
-mozilla-bmo1504834-part3.patch
-
-
-# HG changeset patch
-# Parent aecb4600e5da17443b224c79eee178c1d8e155e3
-For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
-right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
-
-diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
---- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200
-@@ -238,7 +238,18 @@
- AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
- AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
-
-+ // On Big endian the commented out variant doesn't work,
-+ // and honestly, I have no idea why it exists in the first place.
-+ // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
-+ // which gets a 64-bit integer, and FromBits returns 32-bit,
-+ // cutting off the wrong half again.
-+ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
-+ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
-+#ifdef SK_CPU_BENDIAN
-+ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
-+#else
- AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
-+#endif
- AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
- AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
-
-diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
---- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200
-@@ -203,7 +203,13 @@
- // ~~~>
- // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
- // c = 0*aa + d(1-1*aa) = d(1-aa)
-+
-+ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
- return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
- + d.approxMulDiv255(aa.inv());
- };
- while (h --> 0) {
diff --git a/www/firefox-esr/files/patch-bug1559213 b/www/firefox-esr/files/patch-bug1559213
index 09b4dcc58e83..49bbb0fb05ff 100644
--- a/www/firefox-esr/files/patch-bug1559213
+++ b/www/firefox-esr/files/patch-bug1559213
@@ -63,26 +63,27 @@ index 8509aec..eb6f129 100644
EXPORTS += [
diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build
index 0069865..e806fc8 100644
---- media/ffvpx/libavcodec/moz.build
+--- media/ffvpx/libavcodec/moz.build.orig
+++ media/ffvpx/libavcodec/moz.build
-@@ -112,9 +112,15 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
- 'vaapi_vp8.c',
- 'vaapi_vp9.c',
- ]
-+ if CONFIG["MOZ_SYSTEM_AV1"]:
-+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
-+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
-+ else:
-+ USE_LIBS += [
-+ 'dav1d',
-+ 'media_libdav1d_asm',
-+ ]
- USE_LIBS += [
-- 'dav1d',
-- 'media_libdav1d_asm',
- 'mozva'
- ]
-
+@@ -108,10 +108,14 @@
+ 'vp9prob.c',
+ 'vp9recon.c'
+ ]
+- USE_LIBS += [
+- 'dav1d',
+- 'media_libdav1d_asm',
+- ]
++ if CONFIG["MOZ_SYSTEM_AV1"]:
++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
++ else:
++ USE_LIBS += [
++ 'dav1d',
++ 'media_libdav1d_asm',
++ ]
+ if CONFIG['MOZ_WAYLAND']:
+ LOCAL_INCLUDES += ['/media/mozva']
+ SOURCES += [
diff --git toolkit/moz.configure toolkit/moz.configure
index 0069865..e806fc8 100644
--- toolkit/moz.configure
diff --git a/www/firefox-esr/files/patch-bug1640982 b/www/firefox-esr/files/patch-bug1640982
deleted file mode 100644
index dae6ca5fa7b5..000000000000
--- a/www/firefox-esr/files/patch-bug1640982
+++ /dev/null
@@ -1,15 +0,0 @@
-Unbreak build with Rust 1.45.0
-
-error: options `-C embed-bitcode=no` and `-C lto` are incompatible
-
---- config/makefiles/rust.mk.orig 2020-05-12 09:36:22 UTC
-+++ config/makefiles/rust.mk
-@@ -61,7 +61,7 @@ ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
- # gkrust_gtest.
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags +=
- endif
- endif
- endif
diff --git a/www/firefox-esr/files/patch-bug1659612 b/www/firefox-esr/files/patch-bug1659612
index dce125b883d2..a7aea97734a0 100644
--- a/www/firefox-esr/files/patch-bug1659612
+++ b/www/firefox-esr/files/patch-bug1659612
@@ -20,16 +20,22 @@ media/libcubeb/src/cubeb_alsa.c:1168:3: note: include the header <stdlib.h> or e
^
2 errors generated.
---- media/libcubeb/src/cubeb_alsa.c.orig 2021-08-31 14:26:24.530548000 +0200
-+++ media/libcubeb/src/cubeb_alsa.c 2021-08-31 14:26:43.081470000 +0200
-@@ -5,9 +5,7 @@
+--- media/libcubeb/src/cubeb_alsa.c.orig 2023-03-29 20:51:00.139281000 +0200
++++ media/libcubeb/src/cubeb_alsa.c 2023-03-29 20:51:46.219013000 +0200
+@@ -5,12 +5,16 @@
* accompanying file LICENSE for details.
*/
#undef NDEBUG
--#define _DEFAULT_SOURCE
--#define _BSD_SOURCE
--#define _XOPEN_SOURCE 500
-+#define _GNU_SOURCE 1
++#if defined(__FreeBSD__)
++#define _GNU_SOURCE
++#else
+ #define _DEFAULT_SOURCE
+ #define _BSD_SOURCE
+ #if defined(__NetBSD__)
+ #define _NETBSD_SOURCE /* timersub() */
+ #endif
+ #define _XOPEN_SOURCE 500
++#endif
#include "cubeb-internal.h"
#include "cubeb/cubeb.h"
- #include <alsa/asoundlib.h>
+ #include "cubeb_tracing.h"
diff --git a/www/firefox-esr/files/patch-bug1729459_comment12 b/www/firefox-esr/files/patch-bug1729459_comment12
deleted file mode 100644
index dda42170f71b..000000000000
--- a/www/firefox-esr/files/patch-bug1729459_comment12
+++ /dev/null
@@ -1,93 +0,0 @@
---- modules/fdlibm/src/math_private.h.orig 2021-09-30 19:32:33.764224000 +0200
-+++ modules/fdlibm/src/math_private.h 2021-10-02 22:15:33.265122000 +0200
-@@ -30,7 +30,11 @@
- * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
- */
-
--typedef double __double_t;
-+#ifdef __LP64__
-+typedef double __double_t;
-+#else
-+typedef long double __double_t;
-+#endif
- typedef __double_t double_t;
-
- /*
-@@ -630,7 +634,37 @@
- return ((double)(x + 0x1.8p52) - 0x1.8p52);
- }
-
-+static inline float
-+rnintf(__float_t x)
-+{
-+ /*
-+ * As for rnint(), except we could just call that to handle the
-+ * extra precision case, usually without losing efficiency.
-+ */
-+ return ((float)(x + 0x1.8p23F) - 0x1.8p23F);
-+}
-+
-+#ifdef LDBL_MANT_DIG
- /*
-+ * The complications for extra precision are smaller for rnintl() since it
-+ * can safely assume that the rounding precision has been increased from
-+ * its default to FP_PE on x86. We don't exploit that here to get small
-+ * optimizations from limiting the rangle to double. We just need it for
-+ * the magic number to work with long doubles. ld128 callers should use
-+ * rnint() instead of this if possible. ld80 callers should prefer
-+ * rnintl() since for amd64 this avoids swapping the register set, while
-+ * for i386 it makes no difference (assuming FP_PE), and for other arches
-+ * it makes little difference.
-+ */
-+static inline long double
-+rnintl(long double x)
-+{
-+ return (x + __CONCAT(0x1.8p, LDBL_MANT_DIG) / 2 -
-+ __CONCAT(0x1.8p, LDBL_MANT_DIG) / 2);
-+}
-+#endif /* LDBL_MANT_DIG */
-+
-+/*
- * irint() and i64rint() give the same result as casting to their integer
- * return type provided their arg is a floating point integer. They can
- * sometimes be more efficient because no rounding is required.
-@@ -644,6 +678,39 @@
- sizeof(x) == sizeof(long double) ? irintl(x) : (int)(x))
- #else
- #define irint(x) ((int)(x))
-+#endif
-+
-+#define i64rint(x) ((int64_t)(x)) /* only needed for ld128 so not opt. */
-+
-+#if defined(__i386__) && defined(__GNUCLIKE_ASM)
-+static __inline int
-+irintf(float x)
-+{
-+ int n;
-+
-+ __asm("fistl %0" : "=m" (n) : "t" (x));
-+ return (n);
-+}
-+
-+static __inline int
-+irintd(double x)
-+{
-+ int n;
-+
-+ __asm("fistl %0" : "=m" (n) : "t" (x));
-+ return (n);
-+}
-+#endif
-+
-+#if (defined(__amd64__) || defined(__i386__)) && defined(__GNUCLIKE_ASM)
-+static __inline int
-+irintl(long double x)
-+{
-+ int n;
-+
-+ __asm("fistl %0" : "=m" (n) : "t" (x));
-+ return (n);
-+}
- #endif
-
- #ifdef DEBUG
diff --git a/www/firefox-esr/files/patch-bug847568 b/www/firefox-esr/files/patch-bug847568
index 3161dbb88d08..2b3c5e14e99e 100644
--- a/www/firefox-esr/files/patch-bug847568
+++ b/www/firefox-esr/files/patch-bug847568
@@ -97,13 +97,9 @@ index b91d9c1..a97e6eb 100755
echo If gfx/graphite2/src/files.mk has changed, please make corresponding
diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla
index 3180257..4587a3b 100644
---- gfx/harfbuzz/README-mozilla
-+++ gfx/harfbuzz/README-mozilla
-@@ -21,3 +21,8 @@ from within the gfx/harfbuzz directory.
-
- If the collection of source files changes, manual updates to moz.build may be
- needed as we don't use the upstream makefiles.
-+
+--- /dev/null
++++ gfx/harfbuzz/README-mozilla.fbsd
+@@ -0,0 +1,4 @@
+The in-tree copy may be omitted during build by --with-system-harfbuzz.
+Make sure to keep pkg-config version check within toolkit/moz.configure in sync
+with checkout version or increment latest tag by one if it's not based
diff --git a/www/firefox-esr/files/patch-gfx_skia_skia_src_base_SkEndian.h b/www/firefox-esr/files/patch-gfx_skia_skia_src_base_SkEndian.h
new file mode 100644
index 000000000000..656127071a78
--- /dev/null
+++ b/www/firefox-esr/files/patch-gfx_skia_skia_src_base_SkEndian.h
@@ -0,0 +1,11 @@
+--- gfx/skia/skia/src/base/SkEndian.h.orig 2023-06-16 01:32:16.999830000 +0200
++++ gfx/skia/skia/src/base/SkEndian.h 2023-06-16 01:32:41.701673000 +0200
+@@ -131,7 +131,7 @@
+ #define SkTEndian_SwapLE64(n) (n)
+ #else // SK_CPU_BENDIAN
+ #define SkEndian_SwapBE16(n) (n)
+- #define SkEndian_SwapBE32(n) (n)
++ #define SkEndian_SwapBE32(n) uint32_t(n)
+ #define SkEndian_SwapBE64(n) (n)
+ #define SkEndian_SwapLE16(n) SkEndianSwap16(n)
+ #define SkEndian_SwapLE32(n) SkEndianSwap32(n)
diff --git a/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h b/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
new file mode 100644
index 000000000000..64e279cf29f0
--- /dev/null
+++ b/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
@@ -0,0 +1,11 @@
+--- gfx/skia/skia/src/core/SkRasterPipeline.h.orig 2023-06-10 14:20:18.155477000 +0200
++++ gfx/skia/skia/src/core/SkRasterPipeline.h 2023-06-10 14:20:30.760915000 +0200
+@@ -24,7 +24,7 @@
+ struct SkImageInfo;
+ struct skcms_TransferFunction;
+
+-#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32)
++#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && !defined(__powerpc__)
+ #define SK_HAS_MUSTTAIL 1
+ #else
+ #define SK_HAS_MUSTTAIL 0
diff --git a/www/firefox-esr/files/patch-i386-protobuf-alignment b/www/firefox-esr/files/patch-i386-protobuf-alignment
new file mode 100644
index 000000000000..0d58c8644e79
--- /dev/null
+++ b/www/firefox-esr/files/patch-i386-protobuf-alignment
@@ -0,0 +1,15 @@
+# On FreeBSD/i386's LLVM, actual alignment for atomic types requires
+# stricter alignment rules, mostly on 8 byte boundaries instead of 4 byte
+# as indicated by max_align_t.
+
+--- ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h.orig 2022-08-20 20:07:57.096818000 +0200
++++ ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h 2022-08-20 21:40:47.821690000 +0200
+@@ -640,7 +640,7 @@
+ #ifdef _MSC_VER
+ #pragma warning(disable : 4324)
+ #endif
+- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator {
++ struct alignas(alignof(std::atomic<LifecycleIdAtomic>)) CacheAlignedLifecycleIdGenerator {
+ std::atomic<LifecycleIdAtomic> id;
+ };
+ static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;
diff --git a/www/firefox-esr/files/patch-js_public_Utility.h b/www/firefox-esr/files/patch-js_public_Utility.h
new file mode 100644
index 000000000000..4c2e16bc932c
--- /dev/null
+++ b/www/firefox-esr/files/patch-js_public_Utility.h
@@ -0,0 +1,35 @@
+commit 57b30241311091b5a6a5a0bb1c19a8e073860fc3
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+
+ do not assert on alignment when not having the bits
+
+ the underlying issue seemed to be win-only anyways?
+
+diff --git js/public/Utility.h js/public/Utility.h
+index 0d745e9df785..f0ca7ea37162 100644
+--- js/public/Utility.h
++++ js/public/Utility.h
+@@ -480,6 +480,7 @@ static inline void js_free(void* p) {
+ * Note: Do not add a ; at the end of a use of JS_DECLARE_NEW_METHODS,
+ * or the build will break.
+ */
++#if !defined(__i386__)
+ #define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \
+ template <class T, typename... Args> \
+ QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \
+@@ -490,6 +491,15 @@ static inline void js_free(void* p) {
+ return MOZ_LIKELY(memory) ? new (memory) T(std::forward<Args>(args)...) \
+ : nullptr; \
+ }
++#else
++#define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \
++ template <class T, typename... Args> \
++ QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \
++ void* memory = ALLOCATOR(sizeof(T)); \
++ return MOZ_LIKELY(memory) ? new (memory) T(std::forward<Args>(args)...) \
++ : nullptr; \
++ }
++#endif
+
+ /*
+ * Given a class which should provide a 'new' method that takes an arena as
diff --git a/www/firefox-esr/files/patch-libwebrtc-generated b/www/firefox-esr/files/patch-libwebrtc-generated
index d7f0fdecd9c8..9790b777a007 100644
--- a/www/firefox-esr/files/patch-libwebrtc-generated
+++ b/www/firefox-esr/files/patch-libwebrtc-generated
@@ -1,19 +1,25 @@
+commit c15a16ffc6046403213dc435ecb26962706a0da4
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+ regenerate FreeBSD libwebrtc patch for Firefox 115esr
+
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 445f027e82b0..c286ec3735a7 100644
+index aa958f70420c..e6a2d969a1fd 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -22,7 +28,7 @@ index 445f027e82b0..c286ec3735a7 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30,7 +36,7 @@ index 445f027e82b0..c286ec3735a7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -71,6 +77,7 @@ index 445f027e82b0..c286ec3735a7 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -105,10 +112,6 @@ index 445f027e82b0..c286ec3735a7 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -126,6 +129,24 @@ index 445f027e82b0..c286ec3735a7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -159,10 +180,10 @@ index 445f027e82b0..c286ec3735a7 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -176,35 +197,40 @@ index 445f027e82b0..c286ec3735a7 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("resource_adaptation_api_gn")
diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index 0ae35513c8c6..efaa7dd2f99c 100644
+index e453cb8585d0..552c7e77985a 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -213,7 +239,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -221,7 +247,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -262,6 +288,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -309,6 +336,22 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -330,9 +373,10 @@ index 0ae35513c8c6..efaa7dd2f99c 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 += [
@@ -364,21 +408,22 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
-
Library("array_view_gn")
diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index fd8b99d9255f..682ad0f9d8bd 100644
+index c2d256488d9b..1b3eb3a6acb6 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -387,7 +432,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -395,7 +440,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -436,6 +481,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -470,10 +516,6 @@ index fd8b99d9255f..682ad0f9d8bd 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -491,6 +533,24 @@ index fd8b99d9255f..682ad0f9d8bd 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -524,10 +584,10 @@ index fd8b99d9255f..682ad0f9d8bd 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -541,29 +601,33 @@ index fd8b99d9255f..682ad0f9d8bd 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("aec3_config_gn")
diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index c60ef9015b87..1558ddeca767 100644
+index ecd28a700696..4e5509d7162d 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -571,6 +635,7 @@ index c60ef9015b87..1558ddeca767 100644
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
@@ -579,7 +644,7 @@ index c60ef9015b87..1558ddeca767 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -587,7 +652,7 @@ index c60ef9015b87..1558ddeca767 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -632,6 +697,7 @@ index c60ef9015b87..1558ddeca767 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -690,6 +756,24 @@ index c60ef9015b87..1558ddeca767 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -722,8 +806,7 @@ index c60ef9015b87..1558ddeca767 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -741,34 +824,40 @@ index c60ef9015b87..1558ddeca767 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("aec3_factory_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index ca213acc75c3..0c230f0ca1ee 100644
+index 6fac266c7368..ce2f85ba66dc 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -777,7 +866,7 @@ index ca213acc75c3..0c230f0ca1ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -785,7 +874,7 @@ index ca213acc75c3..0c230f0ca1ee 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -826,6 +915,7 @@ index ca213acc75c3..0c230f0ca1ee 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -881,6 +971,24 @@ index ca213acc75c3..0c230f0ca1ee 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -914,9 +1022,207 @@ index ca213acc75c3..0c230f0ca1ee 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("audio_frame_api_gn")
+diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+index 1732aa7d0c9a..a6098a248028 100644
+--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
++++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
@@ -931,35 +1237,31 @@ index ca213acc75c3..0c230f0ca1ee 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_frame_api_gn")
+ Library("audio_frame_processor_gn")
diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 5da87da932c5..33ed59929936 100644
+index 4eac2aa4b4f4..2df8ddd20ca2 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -968,7 +1270,7 @@ index 5da87da932c5..33ed59929936 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -976,7 +1278,7 @@ index 5da87da932c5..33ed59929936 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -1017,6 +1319,7 @@ index 5da87da932c5..33ed59929936 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -1068,6 +1371,22 @@ index 5da87da932c5..33ed59929936 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -1089,9 +1408,10 @@ index 5da87da932c5..33ed59929936 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 += [
@@ -1123,21 +1443,22 @@ index 5da87da932c5..33ed59929936 100644
-
Library("audio_mixer_api_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index a5b0fc942700..32745274dc86 100644
+index 2e128f80386d..6e4054510c88 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -1146,7 +1467,7 @@ index a5b0fc942700..32745274dc86 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1154,7 +1475,7 @@ index a5b0fc942700..32745274dc86 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -1195,6 +1516,7 @@ index a5b0fc942700..32745274dc86 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -1242,6 +1564,22 @@ index a5b0fc942700..32745274dc86 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -1263,9 +1601,10 @@ index a5b0fc942700..32745274dc86 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 += [
@@ -1297,21 +1636,22 @@ index a5b0fc942700..32745274dc86 100644
-
Library("echo_control_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index 7864e79b32ff..cba0bad0a139 100644
+index 87335c298d63..9f1caaa8645d 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -1320,7 +1660,7 @@ index 7864e79b32ff..cba0bad0a139 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1328,7 +1668,7 @@ index 7864e79b32ff..cba0bad0a139 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -1369,6 +1709,7 @@ index 7864e79b32ff..cba0bad0a139 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -1424,6 +1765,24 @@ index 7864e79b32ff..cba0bad0a139 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -1457,10 +1816,10 @@ index 7864e79b32ff..cba0bad0a139 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -1474,35 +1833,40 @@ index 7864e79b32ff..cba0bad0a139 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_decoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index d5a7bad12a54..49bdfc9df78f 100644
+index 49e0d546f1ce..57de72563f2e 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -1511,7 +1875,7 @@ index d5a7bad12a54..49bdfc9df78f 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1519,7 +1883,7 @@ index d5a7bad12a54..49bdfc9df78f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -1560,6 +1924,7 @@ index d5a7bad12a54..49bdfc9df78f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -1615,6 +1980,24 @@ index d5a7bad12a54..49bdfc9df78f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -1648,10 +2031,10 @@ index d5a7bad12a54..49bdfc9df78f 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -1665,35 +2048,40 @@ index d5a7bad12a54..49bdfc9df78f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_encoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 11d2da68af0a..4a80f154a6ae 100644
+index 846946073ee1..0a34d8fdda8a 100644
--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -1702,7 +2090,7 @@ index 11d2da68af0a..4a80f154a6ae 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1710,7 +2098,7 @@ index 11d2da68af0a..4a80f154a6ae 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -1751,6 +2139,7 @@ index 11d2da68af0a..4a80f154a6ae 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -1806,6 +2195,24 @@ index 11d2da68af0a..4a80f154a6ae 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -1839,10 +2246,10 @@ index 11d2da68af0a..4a80f154a6ae 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -1856,38 +2263,41 @@ index 11d2da68af0a..4a80f154a6ae 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_codecs_api_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index 958e41ad74b0..bd2ff7551534 100644
+index 366307ea13d7..7ea300e23f2a 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -11,12 +11,23 @@ AllowCompilerWarnings()
-
+@@ -12,13 +12,22 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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["WEBRTC_USE_BUILTIN_ILBC"] = "1"
-+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
@@ -1897,7 +2307,7 @@ index 958e41ad74b0..bd2ff7551534 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,219 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1905,7 +2315,7 @@ index 958e41ad74b0..bd2ff7551534 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -1923,8 +2333,6 @@ index 958e41ad74b0..bd2ff7551534 100644
-
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -1952,11 +2360,10 @@ index 958e41ad74b0..bd2ff7551534 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -1971,8 +2378,6 @@ index 958e41ad74b0..bd2ff7551534 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -2013,17 +2418,24 @@ index 958e41ad74b0..bd2ff7551534 100644
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+-if CONFIG["CPU_ARCH"] == "mips64":
-
-- OS_LIBS += [
-- "m"
-- ]
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -2049,11 +2461,6 @@ index 958e41ad74b0..bd2ff7551534 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -2062,82 +2469,59 @@ index 958e41ad74b0..bd2ff7551534 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
- OS_LIBS += [
- "android_support"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
-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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
-- OS_LIBS += [
-- "m"
-- ]
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
-- OS_LIBS += [
-- "m"
-- ]
--
++ DEFINES["USE_X11"] = "1"
+
Library("builtin_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index 7f38bd927a31..422ce62ff20e 100644
+index db0e3fbe00d5..0818f76d7b90 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -11,12 +11,23 @@ AllowCompilerWarnings()
-
+@@ -12,13 +12,22 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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["WEBRTC_USE_BUILTIN_ILBC"] = "1"
-+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
@@ -2147,7 +2531,7 @@ index 7f38bd927a31..422ce62ff20e 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,219 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2155,7 +2539,7 @@ index 7f38bd927a31..422ce62ff20e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -2173,8 +2557,6 @@ index 7f38bd927a31..422ce62ff20e 100644
-
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -2202,11 +2584,10 @@ index 7f38bd927a31..422ce62ff20e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -2221,8 +2602,6 @@ index 7f38bd927a31..422ce62ff20e 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -2263,17 +2642,24 @@ index 7f38bd927a31..422ce62ff20e 100644
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+-if CONFIG["CPU_ARCH"] == "mips64":
-
-- OS_LIBS += [
-- "m"
-- ]
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -2299,11 +2685,6 @@ index 7f38bd927a31..422ce62ff20e 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -2312,79 +2693,58 @@ index 7f38bd927a31..422ce62ff20e 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
- OS_LIBS += [
- "android_support"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
-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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
-- OS_LIBS += [
-- "m"
-- ]
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
-- OS_LIBS += [
-- "m"
-- ]
--
++ DEFINES["USE_X11"] = "1"
+
Library("builtin_audio_encoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index 497c53b37e51..d4c446208f12 100644
+index 4782d01dd10f..588ec3b5b33b 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -2393,7 +2753,7 @@ index 497c53b37e51..d4c446208f12 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2401,7 +2761,7 @@ index 497c53b37e51..d4c446208f12 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -2442,6 +2802,7 @@ index 497c53b37e51..d4c446208f12 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -2497,6 +2858,24 @@ index 497c53b37e51..d4c446208f12 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -2530,10 +2909,10 @@ index 497c53b37e51..d4c446208f12 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -2547,35 +2926,40 @@ index 497c53b37e51..d4c446208f12 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_decoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index eebd82c6c4ce..0bcb11877868 100644
+index c972978c13ef..20d76c5496fa 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -2584,7 +2968,7 @@ index eebd82c6c4ce..0bcb11877868 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2592,7 +2976,7 @@ index eebd82c6c4ce..0bcb11877868 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -2633,6 +3017,7 @@ index eebd82c6c4ce..0bcb11877868 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -2688,6 +3073,24 @@ index eebd82c6c4ce..0bcb11877868 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -2721,10 +3124,10 @@ index eebd82c6c4ce..0bcb11877868 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -2738,35 +3141,40 @@ index eebd82c6c4ce..0bcb11877868 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_encoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index f5a808a4a891..b6e2080ea966 100644
+index 77003c77a9dd..f738a9569a45 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -2775,7 +3183,7 @@ index f5a808a4a891..b6e2080ea966 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2783,7 +3191,7 @@ index f5a808a4a891..b6e2080ea966 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -2824,6 +3232,7 @@ index f5a808a4a891..b6e2080ea966 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -2879,6 +3288,24 @@ index f5a808a4a891..b6e2080ea966 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -2912,10 +3339,10 @@ index f5a808a4a891..b6e2080ea966 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -2929,35 +3356,40 @@ index f5a808a4a891..b6e2080ea966 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_decoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 2e9b5830dab5..195fa7f7ede5 100644
+index 41e1e248c525..2cc917d90aab 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -2966,7 +3398,7 @@ index 2e9b5830dab5..195fa7f7ede5 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2974,7 +3406,7 @@ index 2e9b5830dab5..195fa7f7ede5 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -2984,6 +3416,10 @@ index 2e9b5830dab5..195fa7f7ede5 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -3011,6 +3447,7 @@ index 2e9b5830dab5..195fa7f7ede5 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -3045,6 +3482,10 @@ index 2e9b5830dab5..195fa7f7ede5 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -3058,6 +3499,22 @@ index 2e9b5830dab5..195fa7f7ede5 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -3079,9 +3536,10 @@ index 2e9b5830dab5..195fa7f7ede5 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 += [
@@ -3113,21 +3571,22 @@ index 2e9b5830dab5..195fa7f7ede5 100644
-
Library("audio_encoder_g722_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index 4bc77ef9c8c7..8f0736157ebc 100644
+index c3beba6cdb78..8f13941e25c3 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -3136,7 +3595,7 @@ index 4bc77ef9c8c7..8f0736157ebc 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3144,7 +3603,7 @@ index 4bc77ef9c8c7..8f0736157ebc 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -3185,6 +3644,7 @@ index 4bc77ef9c8c7..8f0736157ebc 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -3240,6 +3700,24 @@ index 4bc77ef9c8c7..8f0736157ebc 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -3273,10 +3751,10 @@ index 4bc77ef9c8c7..8f0736157ebc 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -3290,35 +3768,40 @@ index 4bc77ef9c8c7..8f0736157ebc 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_encoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-index 51a1be6760b3..49fff13a82bc 100644
+index 53e9d1a4a7ef..ada577bf55ee 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -3327,7 +3810,7 @@ index 51a1be6760b3..49fff13a82bc 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3335,7 +3818,7 @@ index 51a1be6760b3..49fff13a82bc 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -3380,6 +3863,7 @@ index 51a1be6760b3..49fff13a82bc 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -3438,6 +3922,24 @@ index 51a1be6760b3..49fff13a82bc 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -3470,8 +3972,7 @@ index 51a1be6760b3..49fff13a82bc 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -3489,34 +3990,40 @@ index 51a1be6760b3..49fff13a82bc 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_decoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-index 198b82639e50..f01d64707d83 100644
+index 75737b8f19b0..008599051c34 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -3525,7 +4032,7 @@ index 198b82639e50..f01d64707d83 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3533,7 +4040,7 @@ index 198b82639e50..f01d64707d83 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -3570,6 +4077,7 @@ index 198b82639e50..f01d64707d83 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -3617,6 +4125,22 @@ index 198b82639e50..f01d64707d83 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -3638,9 +4162,10 @@ index 198b82639e50..f01d64707d83 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 += [
@@ -3672,21 +4197,22 @@ index 198b82639e50..f01d64707d83 100644
-
Library("audio_encoder_ilbc_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-index 6b3377177c2b..b1cdc2e7f425 100644
+index bddfe4219301..5d2f4376ee92 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -3695,7 +4221,7 @@ index 6b3377177c2b..b1cdc2e7f425 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3703,7 +4229,7 @@ index 6b3377177c2b..b1cdc2e7f425 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -3748,6 +4274,7 @@ index 6b3377177c2b..b1cdc2e7f425 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -3806,6 +4333,24 @@ index 6b3377177c2b..b1cdc2e7f425 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -3838,8 +4383,7 @@ index 6b3377177c2b..b1cdc2e7f425 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -3857,34 +4401,40 @@ index 6b3377177c2b..b1cdc2e7f425 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_encoder_ilbc_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
-index 38ea6122bd04..130a501939c9 100644
---- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_encoder_ilbc_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+index 2b2bc6d9a7b7..fce4fdca7298 100644
+--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -3893,7 +4443,7 @@ index 38ea6122bd04..130a501939c9 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,151 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3901,7 +4451,7 @@ index 38ea6122bd04..130a501939c9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -3939,14 +4489,10 @@ index 38ea6122bd04..130a501939c9 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "m",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -3983,9 +4529,6 @@ index 38ea6122bd04..130a501939c9 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -3995,6 +4538,34 @@ index 38ea6122bd04..130a501939c9 100644
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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -4019,9 +4590,15 @@ index 38ea6122bd04..130a501939c9 100644
-
- 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"
]
@@ -4034,37 +4611,45 @@ index 38ea6122bd04..130a501939c9 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_decoder_isac_float_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
-index f4a98698ec36..5f0d5d78d272 100644
---- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
-@@ -11,10 +11,21 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_decoder_multiopus_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+index e2c470d5ee58..0c7b461dd94a 100644
+--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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_USE_BUILTIN_ISAC_FIX"] = "0"
-+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4073,7 +4658,7 @@ index f4a98698ec36..5f0d5d78d272 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,207 +47,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4081,7 +4666,7 @@ index f4a98698ec36..5f0d5d78d272 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -4099,8 +4684,6 @@ index f4a98698ec36..5f0d5d78d272 100644
-
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4121,18 +4704,13 @@ index f4a98698ec36..5f0d5d78d272 100644
- 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_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4147,8 +4725,6 @@ index f4a98698ec36..5f0d5d78d272 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -4168,9 +4744,6 @@ index f4a98698ec36..5f0d5d78d272 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -4185,18 +4758,23 @@ index f4a98698ec36..5f0d5d78d272 100644
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
--
--if CONFIG["CPU_ARCH"] == "ppc64":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
+-if CONFIG["CPU_ARCH"] == "mips64":
-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -4218,14 +4796,10 @@ index f4a98698ec36..5f0d5d78d272 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "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 += [
@@ -4235,69 +4809,44 @@ index f4a98698ec36..5f0d5d78d272 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
- OS_LIBS += [
- "android_support"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
-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["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
- Library("audio_decoder_isac_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
-index 6d73bbf414b9..3f239a6b1e48 100644
---- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("audio_decoder_opus_config_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+index 58e6355a5568..c40633ff9ee4 100644
+--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -4306,7 +4855,7 @@ index 6d73bbf414b9..3f239a6b1e48 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,151 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4314,7 +4863,7 @@ index 6d73bbf414b9..3f239a6b1e48 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -4353,13 +4902,13 @@ index 6d73bbf414b9..3f239a6b1e48 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "m",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -4408,6 +4957,34 @@ index 6d73bbf414b9..3f239a6b1e48 100644
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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -4432,9 +5009,15 @@ index 6d73bbf414b9..3f239a6b1e48 100644
-
- 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"
]
@@ -4447,37 +5030,45 @@ index 6d73bbf414b9..3f239a6b1e48 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_encoder_isac_float_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
-index d5ee2a6ba2ed..ed7b32fe640c 100644
---- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
-@@ -11,10 +11,21 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_decoder_opus_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+index 91afd0a4e40a..27167f6f4829 100644
+--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
++++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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_USE_BUILTIN_ISAC_FIX"] = "0"
-+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4486,7 +5077,7 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,207 +47,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4494,7 +5085,7 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -4512,8 +5103,6 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
-
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -4534,18 +5123,13 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
- 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_POSIX"] = True
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4560,8 +5144,6 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -4581,9 +5163,6 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -4595,20 +5174,31 @@ index d5ee2a6ba2ed..ed7b32fe640c 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
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+-if CONFIG["CPU_ARCH"] == "mips64":
-
-- OS_LIBS += [
-- "m"
-- ]
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -4634,11 +5224,6 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -4648,69 +5233,58 @@ index d5ee2a6ba2ed..ed7b32fe640c 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
--
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
-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["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
-- DEFINES["_GNU_SOURCE"] = True
--
-- OS_LIBS += [
-- "m"
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
-- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
-- OS_LIBS += [
-- "m"
-- ]
--
- Library("audio_encoder_isac_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index 54b4309abddb..75e7f69f5636 100644
---- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_encoder_multiopus_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
+index 06732b48f469..0ccb94d1f9fb 100644
+--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
++++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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_OPUS_VARIABLE_COMPLEXITY"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4719,7 +5293,7 @@ index 54b4309abddb..75e7f69f5636 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,175 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4727,7 +5301,7 @@ index 54b4309abddb..75e7f69f5636 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -4737,10 +5311,6 @@ index 54b4309abddb..75e7f69f5636 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -4768,6 +5338,7 @@ index 54b4309abddb..75e7f69f5636 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -4802,10 +5373,6 @@ index 54b4309abddb..75e7f69f5636 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -4823,6 +5390,24 @@ index 54b4309abddb..75e7f69f5636 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -4856,10 +5441,10 @@ index 54b4309abddb..75e7f69f5636 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -4873,35 +5458,40 @@ index 54b4309abddb..75e7f69f5636 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_decoder_multiopus_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index 5d50deec5de3..14d82f743c17 100644
---- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_encoder_opus_config_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
+index ab84d3f7559f..e4bcd225837a 100644
+--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
++++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -4910,7 +5500,7 @@ index 5d50deec5de3..14d82f743c17 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4918,7 +5508,7 @@ index 5d50deec5de3..14d82f743c17 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -4928,6 +5518,10 @@ index 5d50deec5de3..14d82f743c17 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -4952,9 +5546,14 @@ index 5d50deec5de3..14d82f743c17 100644
- 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_POSIX"] = True
@@ -4989,6 +5588,13 @@ index 5d50deec5de3..14d82f743c17 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":
@@ -4998,10 +5604,32 @@ index 5d50deec5de3..14d82f743c17 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -5035,6 +5663,10 @@ index 5d50deec5de3..14d82f743c17 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -5048,30 +5680,40 @@ index 5d50deec5de3..14d82f743c17 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_decoder_opus_config_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index ff5dd08dc992..99f38d65b753 100644
---- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_encoder_opus_gn")
+diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
+index 1b19c42e986c..8d416085b79b 100644
+--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
++++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -5080,7 +5722,7 @@ index ff5dd08dc992..99f38d65b753 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5088,7 +5730,7 @@ index ff5dd08dc992..99f38d65b753 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -5126,13 +5768,10 @@ index ff5dd08dc992..99f38d65b753 100644
- 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_POSIX"] = True
@@ -5167,13 +5806,6 @@ index ff5dd08dc992..99f38d65b753 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":
@@ -5191,6 +5823,24 @@ index ff5dd08dc992..99f38d65b753 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -5223,8 +5873,7 @@ index ff5dd08dc992..99f38d65b753 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -5242,34 +5891,40 @@ index ff5dd08dc992..99f38d65b753 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_decoder_opus_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index 3516af523513..0e3c3096df4c 100644
---- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_options_api_gn")
+diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+index a694eff03b3f..953d60cc35a0 100644
+--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
++++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -5278,7 +5933,7 @@ index 3516af523513..0e3c3096df4c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5286,7 +5941,7 @@ index 3516af523513..0e3c3096df4c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -5327,6 +5982,7 @@ index 3516af523513..0e3c3096df4c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -5361,10 +6017,6 @@ index 3516af523513..0e3c3096df4c 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -5374,14 +6026,26 @@ index 3516af523513..0e3c3096df4c 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -5403,9 +6067,10 @@ index 3516af523513..0e3c3096df4c 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 += [
@@ -5415,10 +6080,6 @@ index 3516af523513..0e3c3096df4c 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -5432,36 +6093,31 @@ index 3516af523513..0e3c3096df4c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_encoder_multiopus_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index 43d7e5274368..065019e59374 100644
---- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+ Library("bitrate_allocation_gn")
+diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
+index e446d8228025..8b21859a8adb 100644
+--- third_party/libwebrtc/api/call_api_gn/moz.build
++++ third_party/libwebrtc/api/call_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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_OPUS_VARIABLE_COMPLEXITY"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -5470,7 +6126,7 @@ index 43d7e5274368..065019e59374 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,164 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5478,7 +6134,7 @@ index 43d7e5274368..065019e59374 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -5488,10 +6144,6 @@ index 43d7e5274368..065019e59374 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -5519,6 +6171,7 @@ index 43d7e5274368..065019e59374 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -5553,10 +6206,6 @@ index 43d7e5274368..065019e59374 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -5566,14 +6215,26 @@ index 43d7e5274368..065019e59374 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -5595,9 +6256,10 @@ index 43d7e5274368..065019e59374 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 += [
@@ -5607,10 +6269,6 @@ index 43d7e5274368..065019e59374 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -5624,35 +6282,31 @@ index 43d7e5274368..065019e59374 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_encoder_opus_config_gn")
-diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index 330a43703234..065955233aab 100644
---- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 b0f2bbbf3545..e51b0bd98f1a 100644
+--- third_party/libwebrtc/api/callfactory_api_gn/moz.build
++++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -5661,7 +6315,7 @@ index 330a43703234..065955233aab 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5669,7 +6323,7 @@ index 330a43703234..065955233aab 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -5714,6 +6368,7 @@ index 330a43703234..065955233aab 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -5764,14 +6419,26 @@ index 330a43703234..065955233aab 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -5793,9 +6460,10 @@ index 330a43703234..065955233aab 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 += [
@@ -5804,12 +6472,7 @@ index 330a43703234..065955233aab 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -5824,33 +6487,30 @@ index 330a43703234..065955233aab 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_encoder_opus_gn")
-diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index cc5b5eb5e4a9..c006b3531c8b 100644
---- third_party/libwebrtc/api/audio_options_api_gn/moz.build
-+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("callfactory_api_gn")
+diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+index 1ce4cdd00a59..16ee32317d2a 100644
+--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
++++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -5859,7 +6519,7 @@ index cc5b5eb5e4a9..c006b3531c8b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5867,7 +6527,7 @@ index cc5b5eb5e4a9..c006b3531c8b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -5908,6 +6568,7 @@ index cc5b5eb5e4a9..c006b3531c8b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -5951,14 +6612,26 @@ index cc5b5eb5e4a9..c006b3531c8b 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -5980,9 +6653,10 @@ index cc5b5eb5e4a9..c006b3531c8b 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 += [
@@ -5991,12 +6665,7 @@ index cc5b5eb5e4a9..c006b3531c8b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -6011,33 +6680,30 @@ index cc5b5eb5e4a9..c006b3531c8b 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_options_api_gn")
-diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index 380799a4aa02..5295e7882d87 100644
---- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("frame_decryptor_interface_gn")
+diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+index b8385d1daacd..0ee97ec6c218 100644
+--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
++++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -6046,7 +6712,7 @@ index 380799a4aa02..5295e7882d87 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6054,7 +6720,7 @@ index 380799a4aa02..5295e7882d87 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -6095,6 +6761,7 @@ index 380799a4aa02..5295e7882d87 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -6142,6 +6809,22 @@ index 380799a4aa02..5295e7882d87 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -6163,9 +6846,10 @@ index 380799a4aa02..5295e7882d87 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 += [
@@ -6195,23 +6879,24 @@ index 380799a4aa02..5295e7882d87 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("bitrate_allocation_gn")
-diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index db4a54575138..2b8a2f5f9497 100644
---- third_party/libwebrtc/api/call_api_gn/moz.build
-+++ third_party/libwebrtc/api/call_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 aee1983c3e76..c6ad466bcf88 100644
+--- third_party/libwebrtc/api/crypto/options_gn/moz.build
++++ third_party/libwebrtc/api/crypto/options_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -6220,7 +6905,7 @@ index db4a54575138..2b8a2f5f9497 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6228,7 +6913,7 @@ index db4a54575138..2b8a2f5f9497 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -6265,6 +6950,7 @@ index db4a54575138..2b8a2f5f9497 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -6308,10 +6994,32 @@ index db4a54575138..2b8a2f5f9497 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -6345,6 +7053,10 @@ index db4a54575138..2b8a2f5f9497 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -6358,30 +7070,40 @@ index db4a54575138..2b8a2f5f9497 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 9f03f48d1987..a6853d8ca3f3 100644
---- third_party/libwebrtc/api/callfactory_api_gn/moz.build
-+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("options_gn")
+diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+index 014e7fe571aa..0e340edaa9b8 100644
+--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
++++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -6390,7 +7112,7 @@ index 9f03f48d1987..a6853d8ca3f3 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6398,7 +7120,7 @@ index 9f03f48d1987..a6853d8ca3f3 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -6435,6 +7157,7 @@ index 9f03f48d1987..a6853d8ca3f3 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -6482,6 +7205,22 @@ index 9f03f48d1987..a6853d8ca3f3 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -6503,9 +7242,10 @@ index 9f03f48d1987..a6853d8ca3f3 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 += [
@@ -6535,23 +7275,24 @@ index 9f03f48d1987..a6853d8ca3f3 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("callfactory_api_gn")
-diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index c8b24c40a820..2162f0030574 100644
---- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("fec_controller_api_gn")
+diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
+index 4210c8af822d..bb3da46c855c 100644
+--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
++++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -6560,7 +7301,7 @@ index c8b24c40a820..2162f0030574 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6568,7 +7309,7 @@ index c8b24c40a820..2162f0030574 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -6609,6 +7350,7 @@ index c8b24c40a820..2162f0030574 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -6652,10 +7394,32 @@ index c8b24c40a820..2162f0030574 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -6689,6 +7453,10 @@ index c8b24c40a820..2162f0030574 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -6702,30 +7470,40 @@ index c8b24c40a820..2162f0030574 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("frame_decryptor_interface_gn")
-diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index cdd14e168edc..fae96897cdb4 100644
---- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("field_trials_registry_gn")
+diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
+index 2c7f147d4afb..3078bdae753b 100644
+--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
++++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -6734,7 +7512,7 @@ index cdd14e168edc..fae96897cdb4 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6742,7 +7520,7 @@ index cdd14e168edc..fae96897cdb4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -6752,10 +7530,6 @@ index cdd14e168edc..fae96897cdb4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -6783,6 +7557,7 @@ index cdd14e168edc..fae96897cdb4 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -6830,6 +7605,22 @@ index cdd14e168edc..fae96897cdb4 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -6851,9 +7642,10 @@ index cdd14e168edc..fae96897cdb4 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 += [
@@ -6883,23 +7675,24 @@ index cdd14e168edc..fae96897cdb4 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- 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 fe9930c25f0e..71c29972a147 100644
---- third_party/libwebrtc/api/crypto/options_gn/moz.build
-+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 885c8437ae88..43b4eeb1d4f0 100644
+--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
++++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -6908,7 +7701,7 @@ index fe9930c25f0e..71c29972a147 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6916,7 +7709,7 @@ index fe9930c25f0e..71c29972a147 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -6927,7 +7720,6 @@ index fe9930c25f0e..71c29972a147 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -6956,13 +7748,13 @@ index fe9930c25f0e..71c29972a147 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -7013,14 +7805,26 @@ index fe9930c25f0e..71c29972a147 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -7042,9 +7846,10 @@ index fe9930c25f0e..71c29972a147 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 += [
@@ -7053,12 +7858,7 @@ index fe9930c25f0e..71c29972a147 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -7073,33 +7873,30 @@ index fe9930c25f0e..71c29972a147 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("options_gn")
-diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index f96ecb9b9e06..23bf32233d01 100644
---- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("frame_transformer_interface_gn")
+diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
+index 59ebc4ae7ad2..53144eed7f3b 100644
+--- third_party/libwebrtc/api/function_view_gn/moz.build
++++ third_party/libwebrtc/api/function_view_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -7108,7 +7905,7 @@ index f96ecb9b9e06..23bf32233d01 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7116,7 +7913,7 @@ index f96ecb9b9e06..23bf32233d01 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -7126,6 +7923,10 @@ index f96ecb9b9e06..23bf32233d01 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -7153,6 +7954,7 @@ index f96ecb9b9e06..23bf32233d01 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -7200,6 +8002,22 @@ index f96ecb9b9e06..23bf32233d01 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -7221,9 +8039,10 @@ index f96ecb9b9e06..23bf32233d01 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 += [
@@ -7253,23 +8072,24 @@ index f96ecb9b9e06..23bf32233d01 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("fec_controller_api_gn")
-diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index 9d7b8c54b3c6..775d63a4a19c 100644
---- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("function_view_gn")
+diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+index 5e41eca1b72c..a918a1104b37 100644
+--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
++++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -7278,7 +8098,7 @@ index 9d7b8c54b3c6..775d63a4a19c 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7286,7 +8106,7 @@ index 9d7b8c54b3c6..775d63a4a19c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -7296,11 +8116,6 @@ index 9d7b8c54b3c6..775d63a4a19c 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "GLESv2",
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -7325,14 +8140,10 @@ index 9d7b8c54b3c6..775d63a4a19c 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -7367,13 +8178,6 @@ index 9d7b8c54b3c6..775d63a4a19c 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":
@@ -7387,6 +8191,22 @@ index 9d7b8c54b3c6..775d63a4a19c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -7408,9 +8228,10 @@ index 9d7b8c54b3c6..775d63a4a19c 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 += [
@@ -7440,23 +8261,24 @@ index 9d7b8c54b3c6..775d63a4a19c 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("frame_transformer_interface_gn")
-diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index 35033d40cc4f..839899398612 100644
---- third_party/libwebrtc/api/function_view_gn/moz.build
-+++ third_party/libwebrtc/api/function_view_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("jingle_logging_api_gn")
+diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
+index 579b7f164b6a..bdbc0d078b7f 100644
+--- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
++++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -7465,7 +8287,7 @@ index 35033d40cc4f..839899398612 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7473,7 +8295,7 @@ index 35033d40cc4f..839899398612 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -7483,10 +8305,6 @@ index 35033d40cc4f..839899398612 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -7514,6 +8332,7 @@ index 35033d40cc4f..839899398612 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -7561,6 +8380,22 @@ index 35033d40cc4f..839899398612 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -7582,9 +8417,10 @@ index 35033d40cc4f..839899398612 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 += [
@@ -7614,23 +8450,24 @@ index 35033d40cc4f..839899398612 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("function_view_gn")
-diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index 9c19d3a155dc..94741e262c65 100644
---- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("jingle_peerconnection_api_gn")
+diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+index 8b3a500acb00..2565408ce87a 100644
+--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
++++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -7639,7 +8476,7 @@ index 9c19d3a155dc..94741e262c65 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7647,7 +8484,7 @@ index 9c19d3a155dc..94741e262c65 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -7684,6 +8521,7 @@ index 9c19d3a155dc..94741e262c65 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -7731,6 +8569,22 @@ index 9c19d3a155dc..94741e262c65 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -7752,9 +8606,10 @@ index 9c19d3a155dc..94741e262c65 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 += [
@@ -7784,23 +8639,24 @@ index 9c19d3a155dc..94741e262c65 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("jingle_logging_api_gn")
+ Library("make_ref_counted_gn")
diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index e515f1be307f..d0df42b36a1f 100644
+index b80f10168f55..7aea55ea197a 100644
--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -7809,7 +8665,7 @@ index e515f1be307f..d0df42b36a1f 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7817,7 +8673,7 @@ index e515f1be307f..d0df42b36a1f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -7858,6 +8714,7 @@ index e515f1be307f..d0df42b36a1f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -7913,6 +8770,24 @@ index e515f1be307f..d0df42b36a1f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -7946,9 +8821,211 @@ index e515f1be307f..d0df42b36a1f 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("media_stream_interface_gn")
+diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
+index dce0ca43192e..9559599c7097 100644
+--- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
++++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
@@ -7963,35 +9040,31 @@ index e515f1be307f..d0df42b36a1f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("media_stream_interface_gn")
+ Library("metronome_gn")
diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index c96bd8795362..afbdad1f295a 100644
+index 273be80f73aa..3def73b6e920 100644
--- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
+++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -8000,7 +9073,7 @@ index c96bd8795362..afbdad1f295a 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8008,7 +9081,7 @@ index c96bd8795362..afbdad1f295a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -8053,6 +9126,7 @@ index c96bd8795362..afbdad1f295a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -8111,6 +9185,24 @@ index c96bd8795362..afbdad1f295a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -8143,8 +9235,7 @@ index c96bd8795362..afbdad1f295a 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -8162,34 +9253,40 @@ index c96bd8795362..afbdad1f295a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("default_neteq_controller_factory_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index a0b4c743fa36..29bdd8823259 100644
+index f06937f581eb..909633162ae6 100644
--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -8198,7 +9295,7 @@ index a0b4c743fa36..29bdd8823259 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8206,7 +9303,7 @@ index a0b4c743fa36..29bdd8823259 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -8251,6 +9348,7 @@ index a0b4c743fa36..29bdd8823259 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -8309,6 +9407,24 @@ index a0b4c743fa36..29bdd8823259 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -8341,8 +9457,7 @@ index a0b4c743fa36..29bdd8823259 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -8360,34 +9475,40 @@ index a0b4c743fa36..29bdd8823259 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("neteq_api_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index 1dcc194cb033..cc1685036edd 100644
+index d09b5aed5335..b63d342a355c 100644
--- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -8396,7 +9517,7 @@ index 1dcc194cb033..cc1685036edd 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8404,7 +9525,7 @@ index 1dcc194cb033..cc1685036edd 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -8449,6 +9570,7 @@ index 1dcc194cb033..cc1685036edd 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -8503,6 +9625,22 @@ index 1dcc194cb033..cc1685036edd 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -8524,9 +9662,10 @@ index 1dcc194cb033..cc1685036edd 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 += [
@@ -8558,21 +9697,22 @@ index 1dcc194cb033..cc1685036edd 100644
-
Library("neteq_controller_api_gn")
diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index c89b3bb7a411..82c7fbace17e 100644
+index 012522550973..10f3a99bcbcd 100644
--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
+++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -8581,7 +9721,7 @@ index c89b3bb7a411..82c7fbace17e 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8589,7 +9729,7 @@ index c89b3bb7a411..82c7fbace17e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -8630,6 +9770,7 @@ index c89b3bb7a411..82c7fbace17e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -8664,10 +9805,6 @@ index c89b3bb7a411..82c7fbace17e 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -8685,6 +9822,24 @@ index c89b3bb7a411..82c7fbace17e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -8718,10 +9873,10 @@ index c89b3bb7a411..82c7fbace17e 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -8735,35 +9890,40 @@ index c89b3bb7a411..82c7fbace17e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("tick_timer_gn")
diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index 1e59d2afe971..2f6e23f32892 100644
+index 2a95233bda53..7f30532ddb95 100644
--- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -8772,7 +9932,7 @@ index 1e59d2afe971..2f6e23f32892 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8780,7 +9940,7 @@ index 1e59d2afe971..2f6e23f32892 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -8817,6 +9977,7 @@ index 1e59d2afe971..2f6e23f32892 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -8864,6 +10025,22 @@ index 1e59d2afe971..2f6e23f32892 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -8885,9 +10062,10 @@ index 1e59d2afe971..2f6e23f32892 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 += [
@@ -8918,22 +10096,23 @@ index 1e59d2afe971..2f6e23f32892 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 812e5cd6cdb5..1b4a93485bff 100644
---- third_party/libwebrtc/api/numerics/numerics_gn/moz.build
-+++ third_party/libwebrtc/api/numerics/numerics_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
+index 08cb5bf2d567..461d52f93d0e 100644
+--- third_party/libwebrtc/api/priority_gn/moz.build
++++ third_party/libwebrtc/api/priority_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -8942,7 +10121,7 @@ index 812e5cd6cdb5..1b4a93485bff 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8950,7 +10129,7 @@ index 812e5cd6cdb5..1b4a93485bff 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -8960,10 +10139,6 @@ index 812e5cd6cdb5..1b4a93485bff 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -8991,6 +10166,7 @@ index 812e5cd6cdb5..1b4a93485bff 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -9025,10 +10201,6 @@ index 812e5cd6cdb5..1b4a93485bff 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -9038,14 +10210,26 @@ index 812e5cd6cdb5..1b4a93485bff 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -9067,9 +10251,10 @@ index 812e5cd6cdb5..1b4a93485bff 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 += [
@@ -9079,10 +10264,6 @@ index 812e5cd6cdb5..1b4a93485bff 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -9096,35 +10277,31 @@ index 812e5cd6cdb5..1b4a93485bff 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("numerics_gn")
-diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index 810e48354b06..6d7e125e5b0a 100644
---- third_party/libwebrtc/api/priority_gn/moz.build
-+++ third_party/libwebrtc/api/priority_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("priority_gn")
+diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
+index f2a22be84640..b048864ad448 100644
+--- third_party/libwebrtc/api/refcountedbase_gn/moz.build
++++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -9133,7 +10310,7 @@ index 810e48354b06..6d7e125e5b0a 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9141,7 +10318,7 @@ index 810e48354b06..6d7e125e5b0a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -9178,6 +10355,7 @@ index 810e48354b06..6d7e125e5b0a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -9225,6 +10403,22 @@ index 810e48354b06..6d7e125e5b0a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -9246,9 +10440,10 @@ index 810e48354b06..6d7e125e5b0a 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 += [
@@ -9278,23 +10473,24 @@ index 810e48354b06..6d7e125e5b0a 100644
-
- 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 f2c7d0e1191c..5b4200b11d2a 100644
---- third_party/libwebrtc/api/refcountedbase_gn/moz.build
-+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("refcountedbase_gn")
+diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
+index 07efa1cf5563..fcf285f401fc 100644
+--- third_party/libwebrtc/api/rtc_error_gn/moz.build
++++ third_party/libwebrtc/api/rtc_error_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -9303,7 +10499,7 @@ index f2c7d0e1191c..5b4200b11d2a 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9311,7 +10507,7 @@ index f2c7d0e1191c..5b4200b11d2a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -9352,6 +10548,7 @@ index f2c7d0e1191c..5b4200b11d2a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -9399,10 +10596,32 @@ index f2c7d0e1191c..5b4200b11d2a 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -9436,6 +10655,10 @@ index f2c7d0e1191c..5b4200b11d2a 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -9449,30 +10672,40 @@ index f2c7d0e1191c..5b4200b11d2a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- 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 a1ae01d70df0..a5b2ee75dbb5 100644
---- third_party/libwebrtc/api/rtc_error_gn/moz.build
-+++ third_party/libwebrtc/api/rtc_error_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ 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 a96be6791fdc..68470ecf6df4 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -9481,7 +10714,7 @@ index a1ae01d70df0..a5b2ee75dbb5 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9489,7 +10722,7 @@ index a1ae01d70df0..a5b2ee75dbb5 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -9530,6 +10763,7 @@ index a1ae01d70df0..a5b2ee75dbb5 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -9585,6 +10819,24 @@ index a1ae01d70df0..a5b2ee75dbb5 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -9618,10 +10870,10 @@ index a1ae01d70df0..a5b2ee75dbb5 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -9635,35 +10887,40 @@ index a1ae01d70df0..a5b2ee75dbb5 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 57ddf1efd92e..ed26491748a2 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ 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 d26fa6a026f9..b5647f419f7c 100644
+--- third_party/libwebrtc/api/rtp_headers_gn/moz.build
++++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -9672,7 +10929,7 @@ index 57ddf1efd92e..ed26491748a2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9680,7 +10937,7 @@ index 57ddf1efd92e..ed26491748a2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -9721,6 +10978,7 @@ index 57ddf1efd92e..ed26491748a2 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -9776,6 +11034,24 @@ index 57ddf1efd92e..ed26491748a2 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -9809,10 +11085,10 @@ index 57ddf1efd92e..ed26491748a2 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -9826,35 +11102,40 @@ index 57ddf1efd92e..ed26491748a2 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 9f80ac1ca01b..ad758d6312d7 100644
---- third_party/libwebrtc/api/rtp_headers_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ 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 99c25cbbaead..df1cf58c7083 100644
+--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
++++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -9863,7 +11144,7 @@ index 9f80ac1ca01b..ad758d6312d7 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9871,7 +11152,7 @@ index 9f80ac1ca01b..ad758d6312d7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -9912,6 +11193,7 @@ index 9f80ac1ca01b..ad758d6312d7 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -9967,6 +11249,24 @@ index 9f80ac1ca01b..ad758d6312d7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -10000,10 +11300,10 @@ index 9f80ac1ca01b..ad758d6312d7 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -10017,35 +11317,40 @@ index 9f80ac1ca01b..ad758d6312d7 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 52eaddda1b31..ec714a44a0df 100644
---- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ 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 4dc6e4a74378..ddc2e7f5536f 100644
+--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
++++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -10054,7 +11359,7 @@ index 52eaddda1b31..ec714a44a0df 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10062,7 +11367,7 @@ index 52eaddda1b31..ec714a44a0df 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -10103,6 +11408,7 @@ index 52eaddda1b31..ec714a44a0df 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -10137,10 +11443,6 @@ index 52eaddda1b31..ec714a44a0df 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -10158,6 +11460,24 @@ index 52eaddda1b31..ec714a44a0df 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -10191,9 +11511,207 @@ index 52eaddda1b31..ec714a44a0df 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 9712e13ddd16..5f6e81fb3f4e 100644
+--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
++++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
@@ -10208,35 +11726,31 @@ index 52eaddda1b31..ec714a44a0df 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- 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 2961df25af8d..261d8126e985 100644
---- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 5cc94b1d99f7..f274d0055498 100644
+--- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
++++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -10245,7 +11759,7 @@ index 2961df25af8d..261d8126e985 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,160 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10253,7 +11767,7 @@ index 2961df25af8d..261d8126e985 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -10294,6 +11808,7 @@ index 2961df25af8d..261d8126e985 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -10328,6 +11843,10 @@ index 2961df25af8d..261d8126e985 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -10345,6 +11864,24 @@ index 2961df25af8d..261d8126e985 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -10377,8 +11914,7 @@ index 2961df25af8d..261d8126e985 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -10396,34 +11932,40 @@ index 2961df25af8d..261d8126e985 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtp_parameters_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("rtp_sender_setparameters_callback_gn")
diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index 286543e6b8d1..b737d063658d 100644
+index 1ca9b4be66c4..a4bf4591450e 100644
--- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -10432,7 +11974,7 @@ index 286543e6b8d1..b737d063658d 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10440,7 +11982,7 @@ index 286543e6b8d1..b737d063658d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -10477,6 +12019,7 @@ index 286543e6b8d1..b737d063658d 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -10524,6 +12067,22 @@ index 286543e6b8d1..b737d063658d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -10545,9 +12104,10 @@ index 286543e6b8d1..b737d063658d 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 += [
@@ -10579,21 +12139,22 @@ index 286543e6b8d1..b737d063658d 100644
-
Library("rtp_transceiver_direction_gn")
diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-index acf366b2f182..40fb2a99c76e 100644
+index d4dbda2c18f8..951e821afca9 100644
--- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -10602,7 +12163,7 @@ index acf366b2f182..40fb2a99c76e 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10610,7 +12171,7 @@ index acf366b2f182..40fb2a99c76e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -10647,6 +12208,7 @@ index acf366b2f182..40fb2a99c76e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -10694,6 +12256,22 @@ index acf366b2f182..40fb2a99c76e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -10715,9 +12293,203 @@ index acf366b2f182..40fb2a99c76e 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("scoped_refptr_gn")
+diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
+index d3dd3980f86a..81e314ac9523 100644
+--- third_party/libwebrtc/api/sequence_checker_gn/moz.build
++++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -10747,23 +12519,24 @@ index acf366b2f182..40fb2a99c76e 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("scoped_refptr_gn")
+ 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 cb130c31a398..019161c0ba01 100644
+index 0867200479f4..04a99f0b12ea 100644
--- third_party/libwebrtc/api/simulated_network_api_gn/moz.build
+++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -10772,7 +12545,7 @@ index cb130c31a398..019161c0ba01 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10780,7 +12553,7 @@ index cb130c31a398..019161c0ba01 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -10791,7 +12564,6 @@ index cb130c31a398..019161c0ba01 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -10819,14 +12591,10 @@ index cb130c31a398..019161c0ba01 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -10861,13 +12629,199 @@ index cb130c31a398..019161c0ba01 100644
- 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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
+- "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("simulated_network_api_gn")
+diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
+index d7e6a087fa00..ba1a6b109e0e 100644
+--- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
++++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
@@ -10877,10 +12831,32 @@ index cb130c31a398..019161c0ba01 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -10914,6 +12890,10 @@ index cb130c31a398..019161c0ba01 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -10927,30 +12907,40 @@ index cb130c31a398..019161c0ba01 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("simulated_network_api_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("pending_task_safety_flag_gn")
diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-index c67f147a275f..0c060438fc87 100644
+index c4d9c9d67d0a..7ff2201844db 100644
--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -10959,7 +12949,7 @@ index c67f147a275f..0c060438fc87 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10967,7 +12957,7 @@ index c67f147a275f..0c060438fc87 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -11008,6 +12998,7 @@ index c67f147a275f..0c060438fc87 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -11059,6 +13050,24 @@ index c67f147a275f..0c060438fc87 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -11091,8 +13100,7 @@ index c67f147a275f..0c060438fc87 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -11110,34 +13118,40 @@ index c67f147a275f..0c060438fc87 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("task_queue_gn")
diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index d775439d5ea1..dcd76fca3f37 100644
+index fba5b45a5df7..39a9ebc0842e 100644
--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -11146,7 +13160,7 @@ index d775439d5ea1..dcd76fca3f37 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11154,7 +13168,7 @@ index d775439d5ea1..dcd76fca3f37 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -11191,6 +13205,7 @@ index d775439d5ea1..dcd76fca3f37 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -11242,6 +13257,24 @@ index d775439d5ea1..dcd76fca3f37 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -11275,9 +13308,215 @@ index d775439d5ea1..dcd76fca3f37 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("bitrate_settings_gn")
+diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+index ac59bcbcde75..cbeb41795c2d 100644
+--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
++++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
@@ -11292,35 +13531,31 @@ index d775439d5ea1..dcd76fca3f37 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("bitrate_settings_gn")
+ Library("datagram_transport_interface_gn")
diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-index bed9afdf2a01..bbfde1dfb32b 100644
+index 1ef79b4d200b..e4486979adcc 100644
--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -11329,7 +13564,7 @@ index bed9afdf2a01..bbfde1dfb32b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11337,7 +13572,7 @@ index bed9afdf2a01..bbfde1dfb32b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -11378,6 +13613,7 @@ index bed9afdf2a01..bbfde1dfb32b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -11433,6 +13669,24 @@ index bed9afdf2a01..bbfde1dfb32b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -11466,10 +13720,10 @@ index bed9afdf2a01..bbfde1dfb32b 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -11483,35 +13737,40 @@ index bed9afdf2a01..bbfde1dfb32b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("field_trial_based_config_gn")
diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 2989b81be163..aeccffe8f194 100644
+index 95cbec37f017..dee377f35156 100644
--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -11520,7 +13779,7 @@ index 2989b81be163..aeccffe8f194 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11528,7 +13787,7 @@ index 2989b81be163..aeccffe8f194 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -11539,7 +13798,6 @@ index 2989b81be163..aeccffe8f194 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -11568,13 +13826,13 @@ index 2989b81be163..aeccffe8f194 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -11633,6 +13891,24 @@ index 2989b81be163..aeccffe8f194 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -11665,8 +13941,7 @@ index 2989b81be163..aeccffe8f194 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -11684,34 +13959,40 @@ index 2989b81be163..aeccffe8f194 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("goog_cc_gn")
diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index deadc8ac83a6..a077649bb095 100644
+index 181843597f7a..f03b20773145 100644
--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -11720,7 +14001,7 @@ index deadc8ac83a6..a077649bb095 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11728,7 +14009,7 @@ index deadc8ac83a6..a077649bb095 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -11769,6 +14050,7 @@ index deadc8ac83a6..a077649bb095 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -11824,6 +14106,24 @@ index deadc8ac83a6..a077649bb095 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -11857,10 +14157,10 @@ index deadc8ac83a6..a077649bb095 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -11874,35 +14174,40 @@ index deadc8ac83a6..a077649bb095 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("network_control_gn")
diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-index c9744ca742b1..9763d1014c10 100644
+index 0ee9e1fa1b7e..8c55ec075d15 100644
--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -11911,7 +14216,7 @@ index c9744ca742b1..9763d1014c10 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11919,7 +14224,7 @@ index c9744ca742b1..9763d1014c10 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -11960,6 +14265,7 @@ index c9744ca742b1..9763d1014c10 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -12011,6 +14317,24 @@ index c9744ca742b1..9763d1014c10 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -12043,8 +14367,7 @@ index c9744ca742b1..9763d1014c10 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -12062,34 +14385,40 @@ index c9744ca742b1..9763d1014c10 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("dependency_descriptor_gn")
diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index 8357ef5ad627..1f8bb62c29f8 100644
+index b43f4a77ec51..7862f9ee7c3d 100644
--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -12098,7 +14427,7 @@ index 8357ef5ad627..1f8bb62c29f8 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12106,7 +14435,7 @@ index 8357ef5ad627..1f8bb62c29f8 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -12147,6 +14476,7 @@ index 8357ef5ad627..1f8bb62c29f8 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -12198,6 +14528,22 @@ index 8357ef5ad627..1f8bb62c29f8 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -12219,9 +14565,10 @@ index 8357ef5ad627..1f8bb62c29f8 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 += [
@@ -12252,22 +14599,23 @@ index 8357ef5ad627..1f8bb62c29f8 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("rtp_source_gn")
-diff --git third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build
-index 7c9e317da4a9..edcedf7243c2 100644
---- third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build
-+++ third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+index dd75da361bf7..39d0ef9756e1 100644
+--- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
++++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -12276,7 +14624,7 @@ index 7c9e317da4a9..edcedf7243c2 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12284,7 +14632,7 @@ index 7c9e317da4a9..edcedf7243c2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -12321,6 +14669,7 @@ index 7c9e317da4a9..edcedf7243c2 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -12368,6 +14717,22 @@ index 7c9e317da4a9..edcedf7243c2 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -12389,9 +14754,10 @@ index 7c9e317da4a9..edcedf7243c2 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 += [
@@ -12421,23 +14787,24 @@ index 7c9e317da4a9..edcedf7243c2 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("webrtc_key_value_config_gn")
+ Library("stun_types_gn")
diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index d82101ec94ab..cd3e8f4d4bdb 100644
+index 5335c2c5196b..98964899137c 100644
--- third_party/libwebrtc/api/transport_api_gn/moz.build
+++ third_party/libwebrtc/api/transport_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -12446,7 +14813,7 @@ index d82101ec94ab..cd3e8f4d4bdb 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12454,7 +14821,7 @@ index d82101ec94ab..cd3e8f4d4bdb 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -12491,6 +14858,7 @@ index d82101ec94ab..cd3e8f4d4bdb 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -12542,6 +14910,24 @@ index d82101ec94ab..cd3e8f4d4bdb 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -12575,10 +14961,10 @@ index d82101ec94ab..cd3e8f4d4bdb 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -12592,35 +14978,40 @@ index d82101ec94ab..cd3e8f4d4bdb 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("transport_api_gn")
diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index db8dfa3e42cf..ef5a44fcdfd6 100644
+index de76b8e11c82..710093b8259e 100644
--- third_party/libwebrtc/api/units/data_rate_gn/moz.build
+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -12629,7 +15020,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12637,7 +15028,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -12678,6 +15069,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -12729,6 +15121,24 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -12761,8 +15171,7 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -12780,34 +15189,40 @@ index db8dfa3e42cf..ef5a44fcdfd6 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("data_rate_gn")
diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index 97e1fb9ed783..ee495c9bdafb 100644
+index dc54ce4f156e..ef4aba55e68f 100644
--- third_party/libwebrtc/api/units/data_size_gn/moz.build
+++ third_party/libwebrtc/api/units/data_size_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -12816,7 +15231,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12824,7 +15239,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -12865,6 +15280,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -12916,6 +15332,24 @@ index 97e1fb9ed783..ee495c9bdafb 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -12948,8 +15382,7 @@ index 97e1fb9ed783..ee495c9bdafb 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -12967,34 +15400,40 @@ index 97e1fb9ed783..ee495c9bdafb 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("data_size_gn")
diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index b47ea78e3866..fb07644764ee 100644
+index 3c84c283b8ec..07ce5ab7d03d 100644
--- third_party/libwebrtc/api/units/frequency_gn/moz.build
+++ third_party/libwebrtc/api/units/frequency_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -13003,7 +15442,7 @@ index b47ea78e3866..fb07644764ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13011,7 +15450,7 @@ index b47ea78e3866..fb07644764ee 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -13052,6 +15491,7 @@ index b47ea78e3866..fb07644764ee 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -13103,6 +15543,24 @@ index b47ea78e3866..fb07644764ee 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -13135,8 +15593,7 @@ index b47ea78e3866..fb07644764ee 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -13154,34 +15611,40 @@ index b47ea78e3866..fb07644764ee 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("frequency_gn")
diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index cb171f6a7784..e02c37634041 100644
+index 3fe57620d83d..99beb9e82767 100644
--- third_party/libwebrtc/api/units/time_delta_gn/moz.build
+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -13190,7 +15653,7 @@ index cb171f6a7784..e02c37634041 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13198,7 +15661,7 @@ index cb171f6a7784..e02c37634041 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -13239,6 +15702,7 @@ index cb171f6a7784..e02c37634041 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -13290,6 +15754,24 @@ index cb171f6a7784..e02c37634041 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -13322,8 +15804,7 @@ index cb171f6a7784..e02c37634041 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -13341,34 +15822,40 @@ index cb171f6a7784..e02c37634041 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("time_delta_gn")
diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index 92f1144788f1..1fed6b8b7bcd 100644
+index a869cbcd713e..41f7f84b1527 100644
--- third_party/libwebrtc/api/units/timestamp_gn/moz.build
+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -13377,7 +15864,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13385,7 +15872,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -13426,6 +15913,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -13477,6 +15965,24 @@ index 92f1144788f1..1fed6b8b7bcd 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -13509,8 +16015,7 @@ index 92f1144788f1..1fed6b8b7bcd 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -13528,34 +16033,40 @@ index 92f1144788f1..1fed6b8b7bcd 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
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 99a84f43d8f4..8aeba5d95cd1 100644
+index 40823f23553c..020bfc89b65a 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -13564,7 +16075,7 @@ index 99a84f43d8f4..8aeba5d95cd1 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13572,7 +16083,7 @@ index 99a84f43d8f4..8aeba5d95cd1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -13612,13 +16123,13 @@ index 99a84f43d8f4..8aeba5d95cd1 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -13677,6 +16188,24 @@ index 99a84f43d8f4..8aeba5d95cd1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -13709,8 +16238,7 @@ index 99a84f43d8f4..8aeba5d95cd1 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -13728,34 +16256,40 @@ index 99a84f43d8f4..8aeba5d95cd1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
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 8ce67d2b1c7c..291f44666f2e 100644
+index f5aee8c8e896..d43142211cf9 100644
--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -13764,7 +16298,7 @@ index 8ce67d2b1c7c..291f44666f2e 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13772,7 +16306,7 @@ index 8ce67d2b1c7c..291f44666f2e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -13783,7 +16317,6 @@ index 8ce67d2b1c7c..291f44666f2e 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -13812,13 +16345,13 @@ index 8ce67d2b1c7c..291f44666f2e 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -13877,6 +16410,24 @@ index 8ce67d2b1c7c..291f44666f2e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -13909,8 +16460,7 @@ index 8ce67d2b1c7c..291f44666f2e 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -13928,34 +16478,40 @@ index 8ce67d2b1c7c..291f44666f2e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index badeb57ac51d..516b54f3a44a 100644
+index aebcf21b3767..4c046aa480ac 100644
--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -13964,7 +16520,7 @@ index badeb57ac51d..516b54f3a44a 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13972,7 +16528,7 @@ index badeb57ac51d..516b54f3a44a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -14013,6 +16569,7 @@ index badeb57ac51d..516b54f3a44a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -14068,6 +16625,24 @@ index badeb57ac51d..516b54f3a44a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -14101,10 +16676,10 @@ index badeb57ac51d..516b54f3a44a 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -14118,35 +16693,40 @@ index badeb57ac51d..516b54f3a44a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("encoded_image_gn")
-diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index 52891f96afb5..f303ca6983c4 100644
---- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 b4c504524c6f..ea11fb826b9e 100644
+--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
++++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -14155,7 +16735,7 @@ index 52891f96afb5..f303ca6983c4 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14163,7 +16743,7 @@ index 52891f96afb5..f303ca6983c4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -14201,9 +16781,14 @@ index 52891f96afb5..f303ca6983c4 100644
- 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_POSIX"] = True
@@ -14240,6 +16825,9 @@ index 52891f96afb5..f303ca6983c4 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -14251,10 +16839,32 @@ index 52891f96afb5..f303ca6983c4 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -14288,6 +16898,10 @@ index 52891f96afb5..f303ca6983c4 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -14301,30 +16915,40 @@ index 52891f96afb5..f303ca6983c4 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("recordable_encoded_frame_gn")
-diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-index 54bb28f68e4c..f0cca879fa6b 100644
---- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("frame_buffer_gn")
+diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+index af294ef3ca63..63707a6269b2 100644
+--- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
++++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -14333,7 +16957,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14341,7 +16965,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -14382,6 +17006,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -14416,6 +17041,10 @@ index 54bb28f68e4c..f0cca879fa6b 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -14425,14 +17054,26 @@ index 54bb28f68e4c..f0cca879fa6b 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -14454,9 +17095,10 @@ index 54bb28f68e4c..f0cca879fa6b 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 += [
@@ -14465,12 +17107,7 @@ index 54bb28f68e4c..f0cca879fa6b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -14485,33 +17122,30 @@ index 54bb28f68e4c..f0cca879fa6b 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_adaptation_gn")
-diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index 392a6954e08d..2972c9dfc15e 100644
---- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("recordable_encoded_frame_gn")
+diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
+index 5f97a983f82e..abe0dea08303 100644
+--- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
++++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -14520,7 +17154,7 @@ index 392a6954e08d..2972c9dfc15e 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14528,7 +17162,7 @@ index 392a6954e08d..2972c9dfc15e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -14538,10 +17172,6 @@ index 392a6954e08d..2972c9dfc15e 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -14569,6 +17199,7 @@ index 392a6954e08d..2972c9dfc15e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -14612,14 +17243,26 @@ index 392a6954e08d..2972c9dfc15e 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -14641,9 +17284,10 @@ index 392a6954e08d..2972c9dfc15e 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 += [
@@ -14652,12 +17296,7 @@ index 392a6954e08d..2972c9dfc15e 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -14672,33 +17311,30 @@ index 392a6954e08d..2972c9dfc15e 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_bitrate_allocation_gn")
-diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index 1db1b3f8dfc0..8832f25dcc93 100644
---- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("render_resolution_gn")
+diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build
+index deafa478ddb9..10bf77256f20 100644
+--- third_party/libwebrtc/api/video/resolution_gn/moz.build
++++ third_party/libwebrtc/api/video/resolution_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -14707,7 +17343,7 @@ index 1db1b3f8dfc0..8832f25dcc93 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14715,7 +17351,7 @@ index 1db1b3f8dfc0..8832f25dcc93 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -14725,10 +17361,6 @@ index 1db1b3f8dfc0..8832f25dcc93 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -14756,6 +17388,7 @@ index 1db1b3f8dfc0..8832f25dcc93 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -14790,10 +17423,6 @@ index 1db1b3f8dfc0..8832f25dcc93 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -14807,6 +17436,22 @@ index 1db1b3f8dfc0..8832f25dcc93 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -14828,9 +17473,10 @@ index 1db1b3f8dfc0..8832f25dcc93 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 += [
@@ -14860,23 +17506,24 @@ index 1db1b3f8dfc0..8832f25dcc93 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_bitrate_allocator_factory_gn")
-diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index 93cb02b8c488..6b239028e2ff 100644
---- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("resolution_gn")
+diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+index 3b4495f26c0c..cd0d8268f411 100644
+--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
++++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -14885,7 +17532,7 @@ index 93cb02b8c488..6b239028e2ff 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14893,7 +17540,7 @@ index 93cb02b8c488..6b239028e2ff 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -14934,6 +17581,7 @@ index 93cb02b8c488..6b239028e2ff 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -14985,6 +17633,24 @@ index 93cb02b8c488..6b239028e2ff 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -15017,8 +17683,7 @@ index 93cb02b8c488..6b239028e2ff 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -15036,34 +17701,40 @@ index 93cb02b8c488..6b239028e2ff 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_bitrate_allocator_gn")
-diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index 842be7341fdc..fd7b28e14176 100644
---- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("video_adaptation_gn")
+diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+index 2c7b1f39e7c2..b2366c6af2a0 100644
+--- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
++++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -15072,7 +17743,7 @@ index 842be7341fdc..fd7b28e14176 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15080,7 +17751,7 @@ index 842be7341fdc..fd7b28e14176 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -15090,6 +17761,10 @@ index 842be7341fdc..fd7b28e14176 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -15117,6 +17792,7 @@ index 842be7341fdc..fd7b28e14176 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -15160,10 +17836,32 @@ index 842be7341fdc..fd7b28e14176 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -15197,6 +17895,10 @@ index 842be7341fdc..fd7b28e14176 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -15210,30 +17912,40 @@ index 842be7341fdc..fd7b28e14176 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_codec_constants_gn")
-diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index 3ed9af4e80a9..2918a04a155e 100644
---- third_party/libwebrtc/api/video/video_frame_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("video_bitrate_allocation_gn")
+diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
+index a6e2e2c6f5a9..8eb8884fe45b 100644
+--- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
++++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -15242,7 +17954,7 @@ index 3ed9af4e80a9..2918a04a155e 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15250,7 +17962,7 @@ index 3ed9af4e80a9..2918a04a155e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -15291,6 +18003,7 @@ index 3ed9af4e80a9..2918a04a155e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -15338,14 +18051,26 @@ index 3ed9af4e80a9..2918a04a155e 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -15367,9 +18092,10 @@ index 3ed9af4e80a9..2918a04a155e 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 += [
@@ -15379,10 +18105,6 @@ index 3ed9af4e80a9..2918a04a155e 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -15396,35 +18118,31 @@ index 3ed9af4e80a9..2918a04a155e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- 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 f5e98b8bdad6..35d3ffb7bfd4 100644
---- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("video_bitrate_allocator_factory_gn")
+diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
+index f09476aacb87..7f6b2b8a30ac 100644
+--- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
++++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -15433,7 +18151,7 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15441,7 +18159,7 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -15452,7 +18170,6 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -15480,14 +18197,10 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -15522,13 +18235,6 @@ index f5e98b8bdad6..35d3ffb7bfd4 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":
@@ -15546,6 +18252,24 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -15578,8 +18302,7 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -15597,34 +18320,40 @@ index f5e98b8bdad6..35d3ffb7bfd4 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_frame_i010_gn")
-diff --git third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build
-index daadd37570ae..08efda34e742 100644
---- third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_frame_i420_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("video_bitrate_allocator_gn")
+diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
+index 2ac72c5b5429..b7f4cc420178 100644
+--- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
++++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -15633,7 +18362,7 @@ index daadd37570ae..08efda34e742 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15641,7 +18370,7 @@ index daadd37570ae..08efda34e742 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -15651,11 +18380,6 @@ index daadd37570ae..08efda34e742 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "GLESv2",
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -15680,14 +18404,10 @@ index daadd37570ae..08efda34e742 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -15722,13 +18442,6 @@ index daadd37570ae..08efda34e742 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":
@@ -15738,14 +18451,26 @@ index daadd37570ae..08efda34e742 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -15767,9 +18492,10 @@ index daadd37570ae..08efda34e742 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 += [
@@ -15778,12 +18504,7 @@ index daadd37570ae..08efda34e742 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -15798,33 +18519,30 @@ index daadd37570ae..08efda34e742 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_frame_i420_gn")
-diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index 09771a194381..c3ad804c51e7 100644
---- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("video_codec_constants_gn")
+diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
+index 7a4e9fdc2c33..c7700a5bcd92 100644
+--- third_party/libwebrtc/api/video/video_frame_gn/moz.build
++++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -15833,7 +18551,7 @@ index 09771a194381..c3ad804c51e7 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,183 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15841,7 +18559,7 @@ index 09771a194381..c3ad804c51e7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -15882,6 +18600,7 @@ index 09771a194381..c3ad804c51e7 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -15937,6 +18656,24 @@ index 09771a194381..c3ad804c51e7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -15970,10 +18707,10 @@ index 09771a194381..c3ad804c51e7 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -15987,35 +18724,40 @@ index 09771a194381..c3ad804c51e7 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_frame_metadata_gn")
-diff --git third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build
-index c4a0e99b1a67..417a46ea6bf2 100644
---- third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_frame_nv12_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 e56d43a29930..735fd52d03b8 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -16024,7 +18766,7 @@ index c4a0e99b1a67..417a46ea6bf2 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16032,7 +18774,7 @@ index c4a0e99b1a67..417a46ea6bf2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -16043,7 +18785,6 @@ index c4a0e99b1a67..417a46ea6bf2 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -16071,14 +18812,10 @@ index c4a0e99b1a67..417a46ea6bf2 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -16115,9 +18852,6 @@ index c4a0e99b1a67..417a46ea6bf2 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -16137,6 +18871,24 @@ index c4a0e99b1a67..417a46ea6bf2 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -16169,8 +18921,7 @@ index c4a0e99b1a67..417a46ea6bf2 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -16188,34 +18939,40 @@ index c4a0e99b1a67..417a46ea6bf2 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_frame_nv12_gn")
-diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index 322b31eae189..9f264c4d4d31 100644
---- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("video_frame_i010_gn")
+diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
+index 2d2221dbb57d..eb03efadbe9a 100644
+--- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
++++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -16224,7 +18981,7 @@ index 322b31eae189..9f264c4d4d31 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16232,7 +18989,7 @@ index 322b31eae189..9f264c4d4d31 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -16242,6 +18999,10 @@ index 322b31eae189..9f264c4d4d31 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -16269,6 +19030,7 @@ index 322b31eae189..9f264c4d4d31 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -16303,6 +19065,10 @@ index 322b31eae189..9f264c4d4d31 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -16312,10 +19078,32 @@ index 322b31eae189..9f264c4d4d31 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -16349,6 +19137,10 @@ index 322b31eae189..9f264c4d4d31 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -16362,30 +19154,40 @@ index 322b31eae189..9f264c4d4d31 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_frame_type_gn")
-diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index 6d9bfe052a35..655b55aced32 100644
---- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("video_frame_metadata_gn")
+diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
+index bc4c46bfbdc5..7b04b10d4157 100644
+--- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
++++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -16394,7 +19196,7 @@ index 6d9bfe052a35..655b55aced32 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16402,7 +19204,7 @@ index 6d9bfe052a35..655b55aced32 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -16412,10 +19214,6 @@ index 6d9bfe052a35..655b55aced32 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -16443,6 +19241,7 @@ index 6d9bfe052a35..655b55aced32 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -16477,10 +19276,6 @@ index 6d9bfe052a35..655b55aced32 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -16490,14 +19285,26 @@ index 6d9bfe052a35..655b55aced32 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -16519,9 +19326,10 @@ index 6d9bfe052a35..655b55aced32 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 += [
@@ -16531,10 +19339,6 @@ index 6d9bfe052a35..655b55aced32 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -16548,35 +19352,31 @@ index 6d9bfe052a35..655b55aced32 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_rtp_headers_gn")
-diff --git third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build
-index f8ab62cc73d0..38b76b381ae2 100644
---- third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_stream_encoder_create_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("video_frame_type_gn")
+diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
+index ded4d37ab6b7..0129e1ce4ed0 100644
+--- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
++++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -16585,7 +19385,7 @@ index f8ab62cc73d0..38b76b381ae2 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16593,7 +19393,7 @@ index f8ab62cc73d0..38b76b381ae2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -16604,7 +19404,6 @@ index f8ab62cc73d0..38b76b381ae2 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -16632,14 +19431,10 @@ index f8ab62cc73d0..38b76b381ae2 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -16674,13 +19469,6 @@ index f8ab62cc73d0..38b76b381ae2 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":
@@ -16690,14 +19478,26 @@ index f8ab62cc73d0..38b76b381ae2 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -16719,9 +19519,10 @@ index f8ab62cc73d0..38b76b381ae2 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 += [
@@ -16730,12 +19531,7 @@ index f8ab62cc73d0..38b76b381ae2 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -16750,33 +19546,30 @@ index f8ab62cc73d0..38b76b381ae2 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_stream_encoder_create_gn")
-diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index 5b023d8dfbbf..8b2ed3f32f47 100644
---- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("video_layers_allocation_gn")
+diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
+index fffe252ebd5c..1bdba7c6dffa 100644
+--- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
++++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -16785,7 +19578,7 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16793,7 +19586,7 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -16834,6 +19627,7 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -16881,10 +19675,32 @@ index 5b023d8dfbbf..8b2ed3f32f47 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -16918,6 +19734,10 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -16931,30 +19751,40 @@ index 5b023d8dfbbf..8b2ed3f32f47 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_stream_encoder_gn")
-diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index 4a0aaf1f6240..bb85facf1bc4 100644
---- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-+++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("video_rtp_headers_gn")
+diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
+index e36bc0df9828..cb189ba6fbb8 100644
+--- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
++++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -16963,7 +19793,7 @@ index 4a0aaf1f6240..bb85facf1bc4 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16971,7 +19801,7 @@ index 4a0aaf1f6240..bb85facf1bc4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -17012,6 +19842,7 @@ index 4a0aaf1f6240..bb85facf1bc4 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -17046,6 +19877,10 @@ index 4a0aaf1f6240..bb85facf1bc4 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -17059,6 +19894,22 @@ index 4a0aaf1f6240..bb85facf1bc4 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -17080,9 +19931,10 @@ index 4a0aaf1f6240..bb85facf1bc4 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 += [
@@ -17112,23 +19964,24 @@ index 4a0aaf1f6240..bb85facf1bc4 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("bitstream_parser_api_gn")
-diff --git third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-index 37bdbe867041..f9d83c4b05b2 100644
---- third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-+++ third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("video_stream_encoder_gn")
+diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
+index dcf5d2273c8d..86180d10a821 100644
+--- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
++++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -17137,7 +19990,7 @@ index 37bdbe867041..f9d83c4b05b2 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17145,7 +19998,7 @@ index 37bdbe867041..f9d83c4b05b2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -17156,7 +20009,6 @@ index 37bdbe867041..f9d83c4b05b2 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -17184,14 +20036,10 @@ index 37bdbe867041..f9d83c4b05b2 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -17226,13 +20074,6 @@ index 37bdbe867041..f9d83c4b05b2 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":
@@ -17242,14 +20083,26 @@ index 37bdbe867041..f9d83c4b05b2 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -17271,9 +20124,10 @@ index 37bdbe867041..f9d83c4b05b2 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 += [
@@ -17282,12 +20136,7 @@ index 37bdbe867041..f9d83c4b05b2 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -17302,33 +20151,30 @@ index 37bdbe867041..f9d83c4b05b2 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("builtin_video_decoder_factory_gn")
-diff --git third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build
-index 63d7916f587b..f0603023db5e 100644
---- third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build
-+++ third_party/libwebrtc/api/video_codecs/builtin_video_encoder_factory_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 987a01bd2f1a..dfcfda00467b 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -17337,7 +20183,7 @@ index 63d7916f587b..f0603023db5e 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17345,7 +20191,7 @@ index 63d7916f587b..f0603023db5e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -17385,13 +20231,13 @@ index 63d7916f587b..f0603023db5e 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -17450,6 +20296,24 @@ index 63d7916f587b..f0603023db5e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -17482,8 +20346,7 @@ index 63d7916f587b..f0603023db5e 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -17501,34 +20364,40 @@ index 63d7916f587b..f0603023db5e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("builtin_video_encoder_factory_gn")
-diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index f3acda93c586..354e52e878af 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rtc_software_fallback_wrappers_gn")
+diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
+index a308bfc58fd9..50cd221a39d7 100644
+--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
++++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -17537,7 +20406,7 @@ index f3acda93c586..354e52e878af 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17545,7 +20414,7 @@ index f3acda93c586..354e52e878af 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -17556,7 +20425,6 @@ index f3acda93c586..354e52e878af 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -17584,14 +20452,10 @@ index f3acda93c586..354e52e878af 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -17626,13 +20490,6 @@ index f3acda93c586..354e52e878af 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":
@@ -17650,6 +20507,24 @@ index f3acda93c586..354e52e878af 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -17682,8 +20557,7 @@ index f3acda93c586..354e52e878af 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -17701,34 +20575,40 @@ index f3acda93c586..354e52e878af 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtc_software_fallback_wrappers_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("scalability_mode_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index cbde20ed59d5..ee169dd583a0 100644
+index eccdc6cfc778..748f6fb1b597 100644
--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -17737,7 +20617,7 @@ index cbde20ed59d5..ee169dd583a0 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,164 +57,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,183 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17745,7 +20625,7 @@ index cbde20ed59d5..ee169dd583a0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -17786,6 +20666,7 @@ index cbde20ed59d5..ee169dd583a0 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -17841,6 +20722,24 @@ index cbde20ed59d5..ee169dd583a0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -17874,10 +20773,10 @@ index cbde20ed59d5..ee169dd583a0 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -17891,35 +20790,40 @@ index cbde20ed59d5..ee169dd583a0 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
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 b2397b024133..4a77d9ee6f62 100644
+index 2769bef0eb29..2b71c8370242 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -17928,7 +20832,7 @@ index b2397b024133..4a77d9ee6f62 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17936,7 +20840,7 @@ index b2397b024133..4a77d9ee6f62 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -17947,7 +20851,6 @@ index b2397b024133..4a77d9ee6f62 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -17976,13 +20879,13 @@ index b2397b024133..4a77d9ee6f62 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -18041,6 +20944,24 @@ index b2397b024133..4a77d9ee6f62 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -18073,8 +20994,7 @@ index b2397b024133..4a77d9ee6f62 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -18092,34 +21012,40 @@ index b2397b024133..4a77d9ee6f62 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("vp8_temporal_layers_factory_gn")
-diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index ffa016f36790..a613258bd36d 100644
---- third_party/libwebrtc/audio/audio_gn/moz.build
-+++ third_party/libwebrtc/audio/audio_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("vp8_temporal_layers_factory_gn")
+diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+index 77f7ba4d70db..524de95cf6e8 100644
+--- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
++++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -18128,7 +21054,7 @@ index ffa016f36790..a613258bd36d 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,173 +62,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18136,7 +21062,7 @@ index ffa016f36790..a613258bd36d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -18146,11 +21072,6 @@ index ffa016f36790..a613258bd36d 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "GLESv2",
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -18175,14 +21096,10 @@ index ffa016f36790..a613258bd36d 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -18217,13 +21134,6 @@ index ffa016f36790..a613258bd36d 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":
@@ -18233,14 +21143,26 @@ index ffa016f36790..a613258bd36d 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -18262,9 +21184,10 @@ index ffa016f36790..a613258bd36d 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 += [
@@ -18273,12 +21196,7 @@ index ffa016f36790..a613258bd36d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -18293,33 +21211,30 @@ index ffa016f36790..a613258bd36d 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_gn")
-diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index d135fbce0b2f..0163aafa277f 100644
---- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 8a35de2e88b4..beb8a0df1b72 100644
+--- third_party/libwebrtc/audio/audio_gn/moz.build
++++ third_party/libwebrtc/audio/audio_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -18328,7 +21243,7 @@ index d135fbce0b2f..0163aafa277f 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,171 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,191 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18336,7 +21251,7 @@ index d135fbce0b2f..0163aafa277f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -18347,6 +21262,7 @@ index d135fbce0b2f..0163aafa277f 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
@@ -18381,6 +21297,7 @@ index d135fbce0b2f..0163aafa277f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -18439,6 +21356,24 @@ index d135fbce0b2f..0163aafa277f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -18471,8 +21406,7 @@ index d135fbce0b2f..0163aafa277f 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -18490,34 +21424,40 @@ index d135fbce0b2f..0163aafa277f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 42be32b5f175..ce11b5528019 100644
---- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_gn")
+diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+index 81aea2d62785..1e0bdc5fc767 100644
+--- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
++++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -18526,7 +21466,7 @@ index 42be32b5f175..ce11b5528019 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,173 +58,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18534,7 +21474,7 @@ index 42be32b5f175..ce11b5528019 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -18545,7 +21485,6 @@ index 42be32b5f175..ce11b5528019 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -18574,13 +21513,13 @@ index 42be32b5f175..ce11b5528019 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -18639,6 +21578,24 @@ index 42be32b5f175..ce11b5528019 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -18671,8 +21628,7 @@ index 42be32b5f175..ce11b5528019 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -18690,34 +21646,40 @@ index 42be32b5f175..ce11b5528019 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("resource_adaptation_gn")
-diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index c72f46fb3f66..f1bfc8428161 100644
---- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 2e887471579d..5bb0f70142e3 100644
+--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
++++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -18726,7 +21688,7 @@ index c72f46fb3f66..f1bfc8428161 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18734,7 +21696,7 @@ index c72f46fb3f66..f1bfc8428161 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -18772,9 +21734,14 @@ index c72f46fb3f66..f1bfc8428161 100644
- 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_POSIX"] = True
@@ -18811,6 +21778,9 @@ index c72f46fb3f66..f1bfc8428161 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -18822,10 +21792,32 @@ index c72f46fb3f66..f1bfc8428161 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -18859,6 +21851,10 @@ index c72f46fb3f66..f1bfc8428161 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -18872,30 +21868,40 @@ index c72f46fb3f66..f1bfc8428161 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_sender_interface_gn")
-diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index ce93a0952f60..b5b26a5563f0 100644
---- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("resource_adaptation_gn")
+diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
+index 6779dfa7cc01..75c30bf9abf4 100644
+--- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
++++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -18904,7 +21910,7 @@ index ce93a0952f60..b5b26a5563f0 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18912,7 +21918,7 @@ index ce93a0952f60..b5b26a5563f0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -18950,13 +21956,10 @@ index ce93a0952f60..b5b26a5563f0 100644
- 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_POSIX"] = True
@@ -18993,9 +21996,6 @@ index ce93a0952f60..b5b26a5563f0 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -19007,14 +22007,26 @@ index ce93a0952f60..b5b26a5563f0 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -19036,9 +22048,10 @@ index ce93a0952f60..b5b26a5563f0 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 += [
@@ -19047,12 +22060,7 @@ index ce93a0952f60..b5b26a5563f0 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -19067,33 +22075,30 @@ index ce93a0952f60..b5b26a5563f0 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- 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 01759daf9e0e..4b41f4da802d 100644
---- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("audio_sender_interface_gn")
+diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
+index ef48a850a44f..7e63d38a987e 100644
+--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
++++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -19102,7 +22107,7 @@ index 01759daf9e0e..4b41f4da802d 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19110,7 +22115,7 @@ index 01759daf9e0e..4b41f4da802d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -19121,7 +22126,6 @@ index 01759daf9e0e..4b41f4da802d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -19150,13 +22154,13 @@ index 01759daf9e0e..4b41f4da802d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -19215,6 +22219,24 @@ index 01759daf9e0e..4b41f4da802d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -19247,8 +22269,7 @@ index 01759daf9e0e..4b41f4da802d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -19266,34 +22287,40 @@ index 01759daf9e0e..4b41f4da802d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("bitrate_configurator_gn")
-diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 75999f70ebf4..2aa75160b723 100644
---- third_party/libwebrtc/call/call_gn/moz.build
-+++ third_party/libwebrtc/call/call_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 b70008b5486c..f62f036ab699 100644
+--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
++++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -19302,7 +22329,7 @@ index 75999f70ebf4..2aa75160b723 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,173 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19310,7 +22337,7 @@ index 75999f70ebf4..2aa75160b723 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -19321,7 +22348,6 @@ index 75999f70ebf4..2aa75160b723 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -19350,13 +22376,13 @@ index 75999f70ebf4..2aa75160b723 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -19415,6 +22441,24 @@ index 75999f70ebf4..2aa75160b723 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -19447,8 +22491,7 @@ index 75999f70ebf4..2aa75160b723 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -19466,34 +22509,40 @@ index 75999f70ebf4..2aa75160b723 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("call_gn")
-diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index 8972117d5a3b..f4aba62a81f9 100644
---- third_party/libwebrtc/call/call_interfaces_gn/moz.build
-+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("bitrate_configurator_gn")
+diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
+index 1f5190649461..21474e0e8eb1 100644
+--- third_party/libwebrtc/call/call_gn/moz.build
++++ third_party/libwebrtc/call/call_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -19502,7 +22551,7 @@ index 8972117d5a3b..f4aba62a81f9 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19510,7 +22559,7 @@ index 8972117d5a3b..f4aba62a81f9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -19550,13 +22599,13 @@ index 8972117d5a3b..f4aba62a81f9 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -19615,6 +22664,24 @@ index 8972117d5a3b..f4aba62a81f9 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -19647,8 +22714,7 @@ index 8972117d5a3b..f4aba62a81f9 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -19666,34 +22732,40 @@ index 8972117d5a3b..f4aba62a81f9 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("call_interfaces_gn")
-diff --git third_party/libwebrtc/call/fake_network_gn/moz.build third_party/libwebrtc/call/fake_network_gn/moz.build
-index ca7850ae8954..c58df99eee98 100644
---- third_party/libwebrtc/call/fake_network_gn/moz.build
-+++ third_party/libwebrtc/call/fake_network_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("call_gn")
+diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
+index 9782bf65f418..d02126352f57 100644
+--- third_party/libwebrtc/call/call_interfaces_gn/moz.build
++++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -19702,7 +22774,7 @@ index ca7850ae8954..c58df99eee98 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19710,7 +22782,7 @@ index ca7850ae8954..c58df99eee98 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -19721,7 +22793,6 @@ index ca7850ae8954..c58df99eee98 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -19750,13 +22821,13 @@ index ca7850ae8954..c58df99eee98 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -19815,6 +22886,24 @@ index ca7850ae8954..c58df99eee98 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -19847,8 +22936,7 @@ index ca7850ae8954..c58df99eee98 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -19866,34 +22954,40 @@ index ca7850ae8954..c58df99eee98 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("fake_network_gn")
-diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index ab48081ff0cb..257c6b99309d 100644
---- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 7be3350326f2..2d90f7bf5333 100644
+--- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
++++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -19902,7 +22996,7 @@ index ab48081ff0cb..257c6b99309d 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19910,7 +23004,7 @@ index ab48081ff0cb..257c6b99309d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -19921,7 +23015,6 @@ index ab48081ff0cb..257c6b99309d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -19950,13 +23043,13 @@ index ab48081ff0cb..257c6b99309d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -20007,14 +23100,26 @@ index ab48081ff0cb..257c6b99309d 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -20036,9 +23141,10 @@ index ab48081ff0cb..257c6b99309d 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 += [
@@ -20047,12 +23153,7 @@ index ab48081ff0cb..257c6b99309d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -20067,33 +23168,30 @@ index ab48081ff0cb..257c6b99309d 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- 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 dd5ab4f0d09e..b6edd7ceb13d 100644
---- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 8e64b723410f..f0698d5291ce 100644
+--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
++++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -20102,7 +23200,7 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20110,7 +23208,7 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -20121,7 +23219,6 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -20150,13 +23247,13 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -20215,6 +23312,24 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -20247,8 +23362,7 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -20266,34 +23380,40 @@ index dd5ab4f0d09e..b6edd7ceb13d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 9431caf12bf5..b3d9d3b82917 100644
---- third_party/libwebrtc/call/rtp_sender_gn/moz.build
-+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 481a02fe5580..4b5e64a7b0a9 100644
+--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
++++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -20302,7 +23422,7 @@ index 9431caf12bf5..b3d9d3b82917 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20310,7 +23430,7 @@ index 9431caf12bf5..b3d9d3b82917 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -20321,7 +23441,6 @@ index 9431caf12bf5..b3d9d3b82917 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -20350,13 +23469,13 @@ index 9431caf12bf5..b3d9d3b82917 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -20415,6 +23534,24 @@ index 9431caf12bf5..b3d9d3b82917 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -20447,8 +23584,7 @@ index 9431caf12bf5..b3d9d3b82917 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -20466,34 +23602,40 @@ index 9431caf12bf5..b3d9d3b82917 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtp_sender_gn")
-diff --git third_party/libwebrtc/call/simulated_network_gn/moz.build third_party/libwebrtc/call/simulated_network_gn/moz.build
-index 9c602d9f8de9..b3354ac10ad9 100644
---- third_party/libwebrtc/call/simulated_network_gn/moz.build
-+++ third_party/libwebrtc/call/simulated_network_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 f823d8ea77d3..2959f53394c1 100644
+--- third_party/libwebrtc/call/rtp_sender_gn/moz.build
++++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -20502,7 +23644,7 @@ index 9c602d9f8de9..b3354ac10ad9 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20510,7 +23652,7 @@ index 9c602d9f8de9..b3354ac10ad9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -20521,7 +23663,6 @@ index 9c602d9f8de9..b3354ac10ad9 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -20550,13 +23691,13 @@ index 9c602d9f8de9..b3354ac10ad9 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -20615,6 +23756,24 @@ index 9c602d9f8de9..b3354ac10ad9 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -20647,8 +23806,7 @@ index 9c602d9f8de9..b3354ac10ad9 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -20666,34 +23824,40 @@ index 9c602d9f8de9..b3354ac10ad9 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("simulated_network_gn")
-diff --git third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
-index 6ad189c079e1..4a15248bad0d 100644
---- third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
-+++ third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rtp_sender_gn")
+diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
+index d6382035216b..b2052c8cd0fb 100644
+--- third_party/libwebrtc/call/version_gn/moz.build
++++ third_party/libwebrtc/call/version_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -20702,7 +23866,7 @@ index 6ad189c079e1..4a15248bad0d 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20710,7 +23874,7 @@ index 6ad189c079e1..4a15248bad0d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -20720,11 +23884,6 @@ index 6ad189c079e1..4a15248bad0d 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "GLESv2",
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -20749,14 +23908,10 @@ index 6ad189c079e1..4a15248bad0d 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -20791,13 +23946,6 @@ index 6ad189c079e1..4a15248bad0d 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":
@@ -20807,10 +23955,32 @@ index 6ad189c079e1..4a15248bad0d 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -20844,6 +24014,10 @@ index 6ad189c079e1..4a15248bad0d 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -20857,30 +24031,40 @@ index 6ad189c079e1..4a15248bad0d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("simulated_packet_receiver_gn")
++ DEFINES["USE_X11"] = "1"
+
+ 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 82aaa062035f..4f21a4bb1f2d 100644
+index c441da830946..7eea7977d9df 100644
--- third_party/libwebrtc/call/video_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -20889,7 +24073,7 @@ index 82aaa062035f..4f21a4bb1f2d 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20897,7 +24081,7 @@ index 82aaa062035f..4f21a4bb1f2d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -20908,7 +24092,6 @@ index 82aaa062035f..4f21a4bb1f2d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -20937,13 +24120,13 @@ index 82aaa062035f..4f21a4bb1f2d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -21002,6 +24185,24 @@ index 82aaa062035f..4f21a4bb1f2d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -21034,8 +24235,7 @@ index 82aaa062035f..4f21a4bb1f2d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -21053,34 +24253,41 @@ index 82aaa062035f..4f21a4bb1f2d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("video_stream_api_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-index a67b1c401d70..d7fe36bb19ad 100644
+index 5526be7b8bed..30d931689b62 100644
--- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-@@ -16,10 +16,19 @@ CXXFLAGS += [
-
+@@ -17,12 +17,21 @@ CXXFLAGS += [
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "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
@@ -21089,7 +24296,7 @@ index a67b1c401d70..d7fe36bb19ad 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,133 +55,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,137 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21097,7 +24304,7 @@ index a67b1c401d70..d7fe36bb19ad 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -21143,6 +24350,7 @@ index a67b1c401d70..d7fe36bb19ad 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -21195,12 +24403,12 @@ index a67b1c401d70..d7fe36bb19ad 100644
-
-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"] == "OpenBSD":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -21210,36 +24418,42 @@ index a67b1c401d70..d7fe36bb19ad 100644
- DEFINES["USE_X11"] = "1"
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- CXXFLAGS += [
- "-msse2"
+- CXXFLAGS += [
+- "-msse2"
+- ]
++ DEFINES["USE_X11"] = "1"
+
+ Library("common_audio_avx2_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-index 555e049415d3..22e6d796aa11 100644
+index 9381d65ceafe..30c5b7a739fc 100644
--- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -21248,7 +24462,7 @@ index 555e049415d3..22e6d796aa11 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,149 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21256,7 +24470,7 @@ index 555e049415d3..22e6d796aa11 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -21293,6 +24507,7 @@ index 555e049415d3..22e6d796aa11 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -21345,6 +24560,22 @@ index 555e049415d3..22e6d796aa11 100644
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S"
- ]
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -21366,9 +24597,10 @@ index 555e049415d3..22e6d796aa11 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 += [
@@ -21400,21 +24632,22 @@ index 555e049415d3..22e6d796aa11 100644
-
Library("common_audio_c_arm_asm_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-index f33242a6409c..491577816add 100644
+index c9d2d986330f..cbb28b276a83 100644
--- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -21423,31 +24656,16 @@ index f33242a6409c..491577816add 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,6 +45,7 @@ UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/ring_buffer.c",
- "/third_party/libwebrtc/common_audio/signal_processing/auto_corr_to_refl_coef.c",
- "/third_party/libwebrtc/common_audio/signal_processing/auto_correlation.c",
-+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
- "/third_party/libwebrtc/common_audio/signal_processing/copy_set_operations.c",
- "/third_party/libwebrtc/common_audio/signal_processing/cross_correlation.c",
-@@ -43,6 +53,7 @@ UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/signal_processing/downsample_fast.c",
- "/third_party/libwebrtc/common_audio/signal_processing/energy.c",
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar.c",
-+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ma_fast_q12.c",
- "/third_party/libwebrtc/common_audio/signal_processing/get_hanning_window.c",
- "/third_party/libwebrtc/common_audio/signal_processing/get_scaling_square.c",
-@@ -78,227 +89,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -80,113 +89,12 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
++ DEFINES["_DEBUG"] = True
+
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -21461,6 +24679,10 @@ index f33242a6409c..491577816add 100644
- "log"
- ]
-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -21472,6 +24694,7 @@ index f33242a6409c..491577816add 100644
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
- ]
-
@@ -21497,6 +24720,7 @@ index f33242a6409c..491577816add 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -21508,9 +24732,11 @@ index f33242a6409c..491577816add 100644
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
- ]
--
++if CONFIG["CPU_ARCH"] == "aarch64":
+
-if CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@@ -21543,18 +24769,20 @@ index f33242a6409c..491577816add 100644
- "secur32",
- "winmm"
- ]
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
-- ]
-+ DEFINES["_DEBUG"] = True
++ DEFINES["WEBRTC_ARCH_ARM64"] = True
++ DEFINES["WEBRTC_HAS_NEON"] = True
- if CONFIG["CPU_ARCH"] == "aarch64":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+@@ -194,26 +102,10 @@ if CONFIG["OS_TARGET"] == "WINNT":
+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
+ ]
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
-if CONFIG["CPU_ARCH"] == "arm":
-
- CFLAGS += [
@@ -21565,13 +24793,43 @@ index f33242a6409c..491577816add 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+
+ SOURCES += [
+ "/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c"
+@@ -230,8 +122,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+
+ if CONFIG["CPU_ARCH"] == "mips64":
+
+- DEFINES["_GNU_SOURCE"] = True
+-
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+ "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
+@@ -246,85 +136,13 @@ if CONFIG["CPU_ARCH"] == "ppc64":
+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
+ ]
+
+-if CONFIG["CPU_ARCH"] == "riscv64":
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
- ]
-
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -21611,8 +24869,7 @@ index f33242a6409c..491577816add 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CFLAGS += [
"-msse2"
]
@@ -21636,55 +24893,68 @@ index f33242a6409c..491577816add 100644
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
-- ]
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+@@ -332,21 +150,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
+ ]
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c"
+- ]
+-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
- CFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
-- ]
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+@@ -354,14 +160,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
+ ]
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
+- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
- ]
--
++ DEFINES["USE_X11"] = "1"
+
Library("common_audio_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-index 595e221a1776..ce15404f651b 100644
+index 90260ba8646c..54512f5b3543 100644
--- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -21693,7 +24963,7 @@ index 595e221a1776..ce15404f651b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21701,7 +24971,7 @@ index 595e221a1776..ce15404f651b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -21746,6 +25016,7 @@ index 595e221a1776..ce15404f651b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -21804,6 +25075,24 @@ index 595e221a1776..ce15404f651b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -21836,8 +25125,7 @@ index 595e221a1776..ce15404f651b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -21855,34 +25143,40 @@ index 595e221a1776..ce15404f651b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("common_audio_cc_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index f2df0ce86b01..da44b258281e 100644
+index c7b74d2e510c..1048f961f8f0 100644
--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -21891,7 +25185,7 @@ index f2df0ce86b01..da44b258281e 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,171 +62,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21899,7 +25193,7 @@ index f2df0ce86b01..da44b258281e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -21944,6 +25238,7 @@ index f2df0ce86b01..da44b258281e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -22002,6 +25297,24 @@ index f2df0ce86b01..da44b258281e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -22034,8 +25347,7 @@ index f2df0ce86b01..da44b258281e 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -22053,28 +25365,33 @@ index f2df0ce86b01..da44b258281e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("common_audio_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index 9fd448df41a0..7e4b1ca13fc2 100644
+index d51e7f4e3541..7d3d05a3e0af 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-@@ -11,11 +11,21 @@ AllowCompilerWarnings()
-
+@@ -12,12 +12,22 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_ARCH_ARM64"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -22083,6 +25400,7 @@ index 9fd448df41a0..7e4b1ca13fc2 100644
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
@@ -22091,7 +25409,7 @@ index 9fd448df41a0..7e4b1ca13fc2 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,147 +53,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,148 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22099,7 +25417,7 @@ index 9fd448df41a0..7e4b1ca13fc2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -22146,6 +25464,7 @@ index 9fd448df41a0..7e4b1ca13fc2 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_BSD"] = True
@@ -22201,8 +25520,8 @@ index 9fd448df41a0..7e4b1ca13fc2 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
@@ -22213,16 +25532,17 @@ index 9fd448df41a0..7e4b1ca13fc2 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
@@ -22240,15 +25560,15 @@ index 9fd448df41a0..7e4b1ca13fc2 100644
-
Library("common_audio_neon_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-index b7088732c3e2..e9a8ecbe4a55 100644
+index 8df7017bff19..8ad021bcb676 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-@@ -11,11 +11,21 @@ AllowCompilerWarnings()
-
+@@ -12,12 +12,22 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_ARCH_ARM64"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -22257,6 +25577,7 @@ index b7088732c3e2..e9a8ecbe4a55 100644
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
@@ -22265,7 +25586,7 @@ index b7088732c3e2..e9a8ecbe4a55 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,147 +52,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,148 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22273,7 +25594,7 @@ index b7088732c3e2..e9a8ecbe4a55 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -22320,6 +25641,7 @@ index b7088732c3e2..e9a8ecbe4a55 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_BSD"] = True
@@ -22375,8 +25697,8 @@ index b7088732c3e2..e9a8ecbe4a55 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
@@ -22387,16 +25709,17 @@ index b7088732c3e2..e9a8ecbe4a55 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-- DEFINES["_DEBUG"] = True
--
+ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
@@ -22414,21 +25737,23 @@ index b7088732c3e2..e9a8ecbe4a55 100644
-
Library("common_audio_neon_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-index 624458bd18aa..22231d6cac19 100644
+index 022ff2845548..81c11ad52373 100644
--- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,12 +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_X11"] = "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
@@ -22437,7 +25762,7 @@ index 624458bd18aa..22231d6cac19 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,155 +50,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,159 +54,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22445,7 +25770,7 @@ index 624458bd18aa..22231d6cac19 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -22499,6 +25824,7 @@ index 624458bd18aa..22231d6cac19 100644
- ]
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -22543,8 +25869,8 @@ index 624458bd18aa..22231d6cac19 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
@@ -22555,8 +25881,8 @@ index 624458bd18aa..22231d6cac19 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -22566,12 +25892,13 @@ index 624458bd18aa..22231d6cac19 100644
- DEFINES["USE_X11"] = "1"
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
--
-- CXXFLAGS += [
-- "-msse2",
-- "-msse2"
-- ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2",
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -22583,34 +25910,39 @@ index 624458bd18aa..22231d6cac19 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++if CONFIG["CPU_ARCH"] == "x86_64":
CXXFLAGS += [
- "-msse2",
+- "-msse2",
"-msse2"
]
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86_64":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- CXXFLAGS += [
- "-msse2"
+- CXXFLAGS += [
+- "-msse2"
+- ]
++ DEFINES["USE_X11"] = "1"
+
+ Library("common_audio_sse2_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-index 3b09c379f34a..ebf3a4dc01ad 100644
+index 52e5226e09a0..f34663641568 100644
--- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -22619,7 +25951,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22627,7 +25959,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -22672,6 +26004,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -22730,6 +26063,24 @@ index 3b09c379f34a..ebf3a4dc01ad 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -22762,8 +26113,7 @@ index 3b09c379f34a..ebf3a4dc01ad 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -22781,34 +26131,40 @@ index 3b09c379f34a..ebf3a4dc01ad 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("fir_filter_factory_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index d1e07d8c39cc..9275144df948 100644
+index f931502550d0..3ccb102e85a9 100644
--- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -22817,7 +26173,7 @@ index d1e07d8c39cc..9275144df948 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22825,7 +26181,7 @@ index d1e07d8c39cc..9275144df948 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -22862,6 +26218,7 @@ index d1e07d8c39cc..9275144df948 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -22909,6 +26266,22 @@ index d1e07d8c39cc..9275144df948 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -22930,9 +26303,10 @@ index d1e07d8c39cc..9275144df948 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 += [
@@ -22964,21 +26338,22 @@ index d1e07d8c39cc..9275144df948 100644
-
Library("fir_filter_gn")
diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-index dbd69345430e..116a3a31c79d 100644
+index 57e889cebd1b..8dc865c12715 100644
--- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
+++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -22987,7 +26362,7 @@ index dbd69345430e..116a3a31c79d 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22995,7 +26370,7 @@ index dbd69345430e..116a3a31c79d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -23040,6 +26415,7 @@ index dbd69345430e..116a3a31c79d 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -23094,6 +26470,22 @@ index dbd69345430e..116a3a31c79d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -23115,9 +26507,10 @@ index dbd69345430e..116a3a31c79d 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 += [
@@ -23149,21 +26542,22 @@ index dbd69345430e..116a3a31c79d 100644
-
Library("sinc_resampler_gn")
diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-index c49141bf6150..9890bd547a22 100644
+index 2f5623b61072..284df3697995 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -23172,7 +26566,7 @@ index c49141bf6150..9890bd547a22 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,96 +49,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,97 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23180,7 +26574,7 @@ index c49141bf6150..9890bd547a22 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -23225,6 +26619,7 @@ index c49141bf6150..9890bd547a22 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -23270,7 +26665,7 @@ index c49141bf6150..9890bd547a22 100644
if CONFIG["CPU_ARCH"] == "aarch64":
-@@ -140,115 +60,25 @@ if CONFIG["CPU_ARCH"] == "aarch64":
+@@ -144,133 +63,42 @@ if CONFIG["CPU_ARCH"] == "aarch64":
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
]
@@ -23288,14 +26683,32 @@ index c49141bf6150..9890bd547a22 100644
- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
- ]
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc"
+ ]
+
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
if CONFIG["CPU_ARCH"] == "x86":
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64":
-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
- ]
@@ -23349,11 +26762,14 @@ index c49141bf6150..9890bd547a22 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
-- ]
--
++ UNIFIED_SOURCES += [
++ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
+ ]
+
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -23363,50 +26779,52 @@ index c49141bf6150..9890bd547a22 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
-- CXXFLAGS += [
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+ CXXFLAGS += [
- "-msse2",
-- "-msse2"
-+ UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
+ "-msse2"
]
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86_64":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
+- CXXFLAGS += [
+- "-msse2"
++ UNIFIED_SOURCES += [
++ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
]
- DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- CXXFLAGS += [
- "-msse2"
-+ UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
- ]
+- ]
++ DEFINES["USE_X11"] = "1"
Library("fft_size_128_gn")
diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-index 21ca8d946852..13f537b170f7 100644
+index 8639a7ae2e0e..3105fcab9d6b 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -23415,7 +26833,7 @@ index 21ca8d946852..13f537b170f7 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23423,7 +26841,7 @@ index 21ca8d946852..13f537b170f7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -23460,6 +26878,7 @@ index 21ca8d946852..13f537b170f7 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -23511,6 +26930,24 @@ index 21ca8d946852..13f537b170f7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -23544,10 +26981,10 @@ index 21ca8d946852..13f537b170f7 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -23561,35 +26998,40 @@ index 21ca8d946852..13f537b170f7 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("fft_size_256_gn")
diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index 87610cfa7d92..f852648a29b5 100644
+index 4bae7df22774..5d194b7d816a 100644
--- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -23598,18 +27040,7 @@ index 87610cfa7d92..f852648a29b5 100644
FINAL_LIBRARY = "webrtc"
-@@ -27,6 +36,10 @@ LOCAL_INCLUDES += [
- "/tools/profiler/public"
- ]
-
-+UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
-+]
-+
- if not CONFIG["MOZ_DEBUG"]:
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -36,202 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,115 +48,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23617,7 +27048,7 @@ index 87610cfa7d92..f852648a29b5 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -23658,6 +27089,7 @@ index 87610cfa7d92..f852648a29b5 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -23715,14 +27147,45 @@ index 87610cfa7d92..f852648a29b5 100644
-
- SOURCES += [
- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S"
-- ]
++ UNIFIED_SOURCES += [
++ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
+ ]
+
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c"
+@@ -155,8 +70,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+
+ if CONFIG["CPU_ARCH"] == "mips64":
+
+- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
+ ]
+@@ -167,107 +80,28 @@ if CONFIG["CPU_ARCH"] == "ppc64":
+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
+ ]
+
+-if CONFIG["CPU_ARCH"] == "riscv64":
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
- ]
-
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -23762,10 +27225,10 @@ index 87610cfa7d92..f852648a29b5 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -23783,53 +27246,58 @@ index 87610cfa7d92..f852648a29b5 100644
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
-- ]
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
+ ]
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
+-
+- CFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- CFLAGS += [
- "-msse2"
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
-- DEFINES["_GNU_SOURCE"] = True
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
-- ]
--
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
- ]
--
++ DEFINES["USE_X11"] = "1"
+
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 c48343244bc0..c69696b581f9 100644
+index 869db500add1..9e5cdb7e6cce 100644
--- third_party/libwebrtc/common_video/common_video_gn/moz.build
+++ third_party/libwebrtc/common_video/common_video_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -23838,7 +27306,7 @@ index c48343244bc0..c69696b581f9 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,173 +62,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,183 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23846,7 +27314,7 @@ index c48343244bc0..c69696b581f9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -23857,7 +27325,6 @@ index c48343244bc0..c69696b581f9 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -23885,14 +27352,10 @@ index c48343244bc0..c69696b581f9 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -23929,9 +27392,6 @@ index c48343244bc0..c69696b581f9 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -23951,6 +27411,24 @@ index c48343244bc0..c69696b581f9 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -23983,8 +27461,7 @@ index c48343244bc0..c69696b581f9 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -24002,34 +27479,40 @@ index c48343244bc0..c69696b581f9 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("common_video_gn")
diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index 2c082466369f..84aa7f656bab 100644
+index 6029016a0e4b..0bd2ab0ab211 100644
--- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -24038,7 +27521,7 @@ index 2c082466369f..84aa7f656bab 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24046,7 +27529,7 @@ index 2c082466369f..84aa7f656bab 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -24083,6 +27566,7 @@ index 2c082466369f..84aa7f656bab 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -24130,6 +27614,22 @@ index 2c082466369f..84aa7f656bab 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -24151,9 +27651,10 @@ index 2c082466369f..84aa7f656bab 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 += [
@@ -24185,21 +27686,22 @@ index 2c082466369f..84aa7f656bab 100644
-
Library("frame_counts_gn")
diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-index 0ef3fdcb1671..4ac389212d99 100644
+index b09e027176e1..0ab69dd829cb 100644
--- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
+++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -24208,7 +27710,7 @@ index 0ef3fdcb1671..4ac389212d99 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24216,7 +27718,7 @@ index 0ef3fdcb1671..4ac389212d99 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -24257,6 +27759,7 @@ index 0ef3fdcb1671..4ac389212d99 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -24308,6 +27811,24 @@ index 0ef3fdcb1671..4ac389212d99 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -24340,8 +27861,7 @@ index 0ef3fdcb1671..4ac389212d99 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -24359,10 +27879,204 @@ index 0ef3fdcb1671..4ac389212d99 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("generic_frame_descriptor_gn")
+diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
+index 2ae645ea741d..82f547782ab4 100644
+--- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
++++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -24370,23 +28084,38 @@ index 0ef3fdcb1671..4ac389212d99 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("generic_frame_descriptor_gn")
+ Library("registered_field_trials_gn")
+diff --git third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build
+index 2f9f14acb430..f8143d2798f0 100644
+--- third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build
++++ third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build
+@@ -31,9 +31,4 @@ LOCAL_INCLUDES += [
+ "/tools/profiler/public"
+ ]
+
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["UNICODE"] = True
+- DEFINES["_UNICODE"] = True
+-
+ 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 a2dece6a12b7..432e51f463cb 100644
+index ddc4a9cc8bdb..76b97cad597b 100644
--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -24395,7 +28124,7 @@ index a2dece6a12b7..432e51f463cb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24403,7 +28132,7 @@ index a2dece6a12b7..432e51f463cb 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -24444,6 +28173,7 @@ index a2dece6a12b7..432e51f463cb 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -24499,6 +28229,24 @@ index a2dece6a12b7..432e51f463cb 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -24532,10 +28280,10 @@ index a2dece6a12b7..432e51f463cb 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -24549,35 +28297,40 @@ index a2dece6a12b7..432e51f463cb 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtc_event_audio_gn")
diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index 0c9c2b9b381a..5dc18d4bb11a 100644
+index 270182b2be45..48e47598a034 100644
--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -24586,7 +28339,7 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24594,7 +28347,7 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -24605,7 +28358,6 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -24633,14 +28385,10 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -24677,9 +28425,6 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -24699,6 +28444,24 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -24731,8 +28494,7 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -24750,34 +28512,40 @@ index 0c9c2b9b381a..5dc18d4bb11a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtc_event_bwe_gn")
-diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index abcbf4c5fadd..91ebed4cde5d 100644
---- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rtc_event_bwe_gn")
+diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
+index 7a816f43289d..9c1a7bd6de3f 100644
+--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
++++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -24786,7 +28554,7 @@ index abcbf4c5fadd..91ebed4cde5d 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24794,7 +28562,7 @@ index abcbf4c5fadd..91ebed4cde5d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -24835,6 +28603,7 @@ index abcbf4c5fadd..91ebed4cde5d 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -24890,6 +28659,24 @@ index abcbf4c5fadd..91ebed4cde5d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -24923,11 +28710,222 @@ index abcbf4c5fadd..91ebed4cde5d 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("rtc_event_field_gn")
+diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
+index ad1c2615454e..7838b57024ae 100644
+--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
++++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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"
+
+@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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"
- ]
-
@@ -24940,35 +28938,255 @@ index abcbf4c5fadd..91ebed4cde5d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("rtc_event_number_encodings_gn")
+diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
+index a920e8d64332..ffe265db0851 100644
+--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
++++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
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 bb7d3ae4cfbf..8f2bd7a66167 100644
+index bb826e4a720e..b290dc3e72e7 100644
--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -24977,7 +29195,7 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,173 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24985,7 +29203,7 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -24996,7 +29214,6 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -25025,13 +29242,13 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -25090,6 +29307,24 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -25122,8 +29357,7 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -25141,34 +29375,40 @@ index bb7d3ae4cfbf..8f2bd7a66167 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtc_event_rtp_rtcp_gn")
diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index 30ec45d4504a..673345365fea 100644
+index 423abc9ec40c..cf444b4316cd 100644
--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -25177,7 +29417,7 @@ index 30ec45d4504a..673345365fea 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25185,7 +29425,7 @@ index 30ec45d4504a..673345365fea 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -25226,6 +29466,7 @@ index 30ec45d4504a..673345365fea 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -25281,6 +29522,24 @@ index 30ec45d4504a..673345365fea 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -25314,10 +29573,10 @@ index 30ec45d4504a..673345365fea 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -25331,35 +29590,40 @@ index 30ec45d4504a..673345365fea 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtc_event_video_gn")
diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index 64d287112de4..b7341fb31efe 100644
+index 14ba953e29d3..96ef93e69179 100644
--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -25368,7 +29632,7 @@ index 64d287112de4..b7341fb31efe 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25376,7 +29640,7 @@ index 64d287112de4..b7341fb31efe 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -25417,6 +29681,7 @@ index 64d287112de4..b7341fb31efe 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -25472,6 +29737,24 @@ index 64d287112de4..b7341fb31efe 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -25505,10 +29788,10 @@ index 64d287112de4..b7341fb31efe 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -25522,35 +29805,40 @@ index 64d287112de4..b7341fb31efe 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtc_stream_config_gn")
-diff --git third_party/libwebrtc/media/rtc_constants_gn/moz.build third_party/libwebrtc/media/rtc_constants_gn/moz.build
-index e974486fb73f..6ed2d47ba9a7 100644
---- third_party/libwebrtc/media/rtc_constants_gn/moz.build
-+++ third_party/libwebrtc/media/rtc_constants_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ 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 6b56a082191f..f5bac588d11b 100644
+--- third_party/libwebrtc/media/codec_gn/moz.build
++++ third_party/libwebrtc/media/codec_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -25559,7 +29847,7 @@ index e974486fb73f..6ed2d47ba9a7 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25567,7 +29855,7 @@ index e974486fb73f..6ed2d47ba9a7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -25577,6 +29865,10 @@ index e974486fb73f..6ed2d47ba9a7 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -25604,6 +29896,7 @@ index e974486fb73f..6ed2d47ba9a7 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -25638,6 +29931,10 @@ index e974486fb73f..6ed2d47ba9a7 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -25655,6 +29952,24 @@ index e974486fb73f..6ed2d47ba9a7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -25688,9 +30003,207 @@ index e974486fb73f..6ed2d47ba9a7 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- 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 12b25ac016e3..3a95f5ef1faf 100644
+--- third_party/libwebrtc/media/delayable_gn/moz.build
++++ third_party/libwebrtc/media/delayable_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
@@ -25705,35 +30218,31 @@ index e974486fb73f..6ed2d47ba9a7 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("rtc_constants_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 2b377c439832..1cace339002b 100644
---- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
-+++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("delayable_gn")
+diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
+index d031085023fb..863e7fde7105 100644
+--- third_party/libwebrtc/media/media_channel_gn/moz.build
++++ third_party/libwebrtc/media/media_channel_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -25742,7 +30251,7 @@ index 2b377c439832..1cace339002b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25750,7 +30259,7 @@ index 2b377c439832..1cace339002b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -25790,13 +30299,13 @@ index 2b377c439832..1cace339002b 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -25847,14 +30356,26 @@ index 2b377c439832..1cace339002b 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -25876,9 +30397,10 @@ index 2b377c439832..1cace339002b 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 += [
@@ -25887,12 +30409,7 @@ index 2b377c439832..1cace339002b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -25907,33 +30424,30 @@ index 2b377c439832..1cace339002b 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("rtc_encoder_simulcast_proxy_gn")
-diff --git third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build
-index 6844178c6ccc..29eec2b96ff1 100644
---- third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build
-+++ third_party/libwebrtc/media/rtc_h264_profile_id_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 49b90be2fc51..7f0b3bc10a7f 100644
+--- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
++++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -25942,7 +30456,7 @@ index 6844178c6ccc..29eec2b96ff1 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25950,7 +30464,7 @@ index 6844178c6ccc..29eec2b96ff1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -25960,11 +30474,6 @@ index 6844178c6ccc..29eec2b96ff1 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "GLESv2",
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -25989,14 +30498,10 @@ index 6844178c6ccc..29eec2b96ff1 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -26031,13 +30536,195 @@ index 6844178c6ccc..29eec2b96ff1 100644
- 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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
+- "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("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 fb30505356f2..28762fdde6a3 100644
+--- third_party/libwebrtc/media/media_constants_gn/moz.build
++++ third_party/libwebrtc/media/media_constants_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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":
@@ -26055,6 +30742,24 @@ index 6844178c6ccc..29eec2b96ff1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -26087,8 +30792,7 @@ index 6844178c6ccc..29eec2b96ff1 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -26106,34 +30810,229 @@ index 6844178c6ccc..29eec2b96ff1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- 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 73ebe8374986..c11ccc5b2902 100644
+--- third_party/libwebrtc/media/rid_description_gn/moz.build
++++ third_party/libwebrtc/media/rid_description_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
-
- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
-
- Library("rtc_h264_profile_id_gn")
-diff --git third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-index 56ef2c321cfe..114eab3d547f 100644
---- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-+++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+-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("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 040f27525274..f16bd9e3d193 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -26142,7 +31041,7 @@ index 56ef2c321cfe..114eab3d547f 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26150,7 +31049,7 @@ index 56ef2c321cfe..114eab3d547f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -26190,13 +31089,13 @@ index 56ef2c321cfe..114eab3d547f 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -26255,6 +31154,24 @@ index 56ef2c321cfe..114eab3d547f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -26287,8 +31204,7 @@ index 56ef2c321cfe..114eab3d547f 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -26306,34 +31222,40 @@ index 56ef2c321cfe..114eab3d547f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtc_internal_video_codecs_gn")
++ DEFINES["USE_X11"] = "1"
+
+ 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 f1c19c6dd9fe..7f7f4d1a7002 100644
+index a48b9886dd24..fcc31ea11376 100644
--- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -26342,7 +31264,7 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26350,7 +31272,7 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -26390,13 +31312,13 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -26455,6 +31377,24 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -26487,8 +31427,7 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -26506,34 +31445,40 @@ index f1c19c6dd9fe..7f7f4d1a7002 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtc_media_base_gn")
diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index a9926573ede9..0354b4ba19a1 100644
+index 568632c48fb8..94c43caef47b 100644
--- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -26542,7 +31487,7 @@ index a9926573ede9..0354b4ba19a1 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26550,7 +31495,7 @@ index a9926573ede9..0354b4ba19a1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -26587,6 +31532,7 @@ index a9926573ede9..0354b4ba19a1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -26634,6 +31580,22 @@ index a9926573ede9..0354b4ba19a1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -26655,9 +31617,10 @@ index a9926573ede9..0354b4ba19a1 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 += [
@@ -26689,21 +31652,22 @@ index a9926573ede9..0354b4ba19a1 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 ceaa7aec0299..e8e941546b56 100644
+index 4293ba6d9066..01eda12bd559 100644
--- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -26712,7 +31676,7 @@ index ceaa7aec0299..e8e941546b56 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26720,7 +31684,7 @@ index ceaa7aec0299..e8e941546b56 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -26760,13 +31724,13 @@ index ceaa7aec0299..e8e941546b56 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -26825,6 +31789,24 @@ index ceaa7aec0299..e8e941546b56 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -26857,8 +31839,7 @@ index ceaa7aec0299..e8e941546b56 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -26876,10 +31857,204 @@ index ceaa7aec0299..e8e941546b56 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ 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 d12f755865a5..a5d44da104b6 100644
+--- third_party/libwebrtc/media/rtp_utils_gn/moz.build
++++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -26887,23 +32062,213 @@ index ceaa7aec0299..e8e941546b56 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("rtc_simulcast_encoder_adapter_gn")
-diff --git third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build
-index ef896d5ff6ee..fe12af945eb1 100644
---- third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build
-+++ third_party/libwebrtc/media/rtc_vp9_profile_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+ 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 2deba906b932..65ec7aef0025 100644
+--- third_party/libwebrtc/media/stream_params_gn/moz.build
++++ third_party/libwebrtc/media/stream_params_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("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 f599fadae2f0..90a52e406005 100644
+--- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
++++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -26912,7 +32277,7 @@ index ef896d5ff6ee..fe12af945eb1 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26920,7 +32285,7 @@ index ef896d5ff6ee..fe12af945eb1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -26961,6 +32326,7 @@ index ef896d5ff6ee..fe12af945eb1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -27016,6 +32382,24 @@ index ef896d5ff6ee..fe12af945eb1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -27049,10 +32433,10 @@ index ef896d5ff6ee..fe12af945eb1 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -27066,35 +32450,40 @@ index ef896d5ff6ee..fe12af945eb1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtc_vp9_profile_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("async_audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index 2584f7b5b22e..96ccc03c0b2a 100644
+index 03d99c93b89a..a1a7c66b6ff0 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -27103,7 +32492,7 @@ index 2584f7b5b22e..96ccc03c0b2a 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27111,7 +32500,7 @@ index 2584f7b5b22e..96ccc03c0b2a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -27156,6 +32545,7 @@ index 2584f7b5b22e..96ccc03c0b2a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -27214,6 +32604,24 @@ index 2584f7b5b22e..96ccc03c0b2a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -27246,8 +32654,7 @@ index 2584f7b5b22e..96ccc03c0b2a 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -27265,34 +32672,40 @@ index 2584f7b5b22e..96ccc03c0b2a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_coding_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index ff52a5e847a4..a4e5154d2e30 100644
+index 2826ed8642f9..e8194cf79b99 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -27301,7 +32714,7 @@ index ff52a5e847a4..a4e5154d2e30 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27309,7 +32722,7 @@ index ff52a5e847a4..a4e5154d2e30 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -27346,6 +32759,7 @@ index ff52a5e847a4..a4e5154d2e30 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -27393,6 +32807,22 @@ index ff52a5e847a4..a4e5154d2e30 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -27414,9 +32844,10 @@ index ff52a5e847a4..a4e5154d2e30 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 += [
@@ -27448,21 +32879,22 @@ index ff52a5e847a4..a4e5154d2e30 100644
-
Library("audio_coding_module_typedefs_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index d937e61e646e..9e00d72094ad 100644
+index bf852e8442a4..de2e04dffe32 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -27471,7 +32903,7 @@ index d937e61e646e..9e00d72094ad 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27479,7 +32911,7 @@ index d937e61e646e..9e00d72094ad 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -27520,6 +32952,7 @@ index d937e61e646e..9e00d72094ad 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -27575,6 +33008,24 @@ index d937e61e646e..9e00d72094ad 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -27608,10 +33059,10 @@ index d937e61e646e..9e00d72094ad 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -27625,35 +33076,40 @@ index d937e61e646e..9e00d72094ad 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_coding_opus_common_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index d1a7bb0c2343..5b02f56d0388 100644
+index 56b6d50f6cb7..7ef50512ec05 100644
--- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -27662,7 +33118,7 @@ index d1a7bb0c2343..5b02f56d0388 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27670,7 +33126,7 @@ index d1a7bb0c2343..5b02f56d0388 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -27715,6 +33171,7 @@ index d1a7bb0c2343..5b02f56d0388 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -27773,6 +33230,24 @@ index d1a7bb0c2343..5b02f56d0388 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -27805,8 +33280,7 @@ index d1a7bb0c2343..5b02f56d0388 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -27824,34 +33298,40 @@ index d1a7bb0c2343..5b02f56d0388 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_encoder_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index 571034c095bf..d380fdacde8d 100644
+index 37cf81ad9f54..a17cc5124685 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -27860,7 +33340,7 @@ index 571034c095bf..d380fdacde8d 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27868,7 +33348,7 @@ index 571034c095bf..d380fdacde8d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -27905,6 +33385,7 @@ index 571034c095bf..d380fdacde8d 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -27956,6 +33437,24 @@ index 571034c095bf..d380fdacde8d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -27989,10 +33488,10 @@ index 571034c095bf..d380fdacde8d 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -28006,35 +33505,40 @@ index 571034c095bf..d380fdacde8d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_network_adaptor_config_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index 83b98d03b4e4..47f9372a3758 100644
+index 1d0905ebc109..ba348ebeecff 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -28043,7 +33547,7 @@ index 83b98d03b4e4..47f9372a3758 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,171 +59,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28051,7 +33555,7 @@ index 83b98d03b4e4..47f9372a3758 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -28096,6 +33600,7 @@ index 83b98d03b4e4..47f9372a3758 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -28154,6 +33659,24 @@ index 83b98d03b4e4..47f9372a3758 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -28186,8 +33709,7 @@ index 83b98d03b4e4..47f9372a3758 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -28205,34 +33727,40 @@ index 83b98d03b4e4..47f9372a3758 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_network_adaptor_gn")
diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-index b3cba7d919b2..cd006b3d12d1 100644
+index 206a4ae313fd..145619c84116 100644
--- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -28241,7 +33769,7 @@ index b3cba7d919b2..cd006b3d12d1 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28249,7 +33777,7 @@ index b3cba7d919b2..cd006b3d12d1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -28294,6 +33822,7 @@ index b3cba7d919b2..cd006b3d12d1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -28352,6 +33881,24 @@ index b3cba7d919b2..cd006b3d12d1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -28384,8 +33931,7 @@ index b3cba7d919b2..cd006b3d12d1 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -28403,34 +33949,40 @@ index b3cba7d919b2..cd006b3d12d1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("default_neteq_factory_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index e3c1102d8d09..adb7ec292829 100644
+index 8322910094eb..7bfe819841af 100644
--- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -28439,7 +33991,7 @@ index e3c1102d8d09..adb7ec292829 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28447,7 +33999,7 @@ index e3c1102d8d09..adb7ec292829 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -28484,6 +34036,7 @@ index e3c1102d8d09..adb7ec292829 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -28535,6 +34088,24 @@ index e3c1102d8d09..adb7ec292829 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -28568,10 +34139,10 @@ index e3c1102d8d09..adb7ec292829 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -28585,35 +34156,40 @@ index e3c1102d8d09..adb7ec292829 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CFLAGS += [
- "-msse2"
- ]
+- CFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("g711_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index 6b7718168b4e..4fcf33548fad 100644
+index 3a21cddc41e2..80e618a7fa10 100644
--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -28622,7 +34198,7 @@ index 6b7718168b4e..4fcf33548fad 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28630,7 +34206,7 @@ index 6b7718168b4e..4fcf33548fad 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -28671,6 +34247,7 @@ index 6b7718168b4e..4fcf33548fad 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -28726,6 +34303,24 @@ index 6b7718168b4e..4fcf33548fad 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -28759,10 +34354,10 @@ index 6b7718168b4e..4fcf33548fad 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -28776,35 +34371,40 @@ index 6b7718168b4e..4fcf33548fad 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("g711_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index 3fc0bef73618..ff658fd5f220 100644
+index dc05788b8021..add81cce3212 100644
--- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -28813,7 +34413,7 @@ index 3fc0bef73618..ff658fd5f220 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28821,7 +34421,7 @@ index 3fc0bef73618..ff658fd5f220 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -28858,6 +34458,7 @@ index 3fc0bef73618..ff658fd5f220 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -28909,6 +34510,24 @@ index 3fc0bef73618..ff658fd5f220 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -28942,10 +34561,10 @@ index 3fc0bef73618..ff658fd5f220 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -28959,35 +34578,40 @@ index 3fc0bef73618..ff658fd5f220 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CFLAGS += [
- "-msse2"
- ]
+- CFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("g722_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index d7d25e6fb410..48204da0acde 100644
+index 910eef267ffc..d53536655acd 100644
--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -28996,7 +34620,7 @@ index d7d25e6fb410..48204da0acde 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29004,7 +34628,7 @@ index d7d25e6fb410..48204da0acde 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -29045,6 +34669,7 @@ index d7d25e6fb410..48204da0acde 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -29100,6 +34725,24 @@ index d7d25e6fb410..48204da0acde 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -29133,10 +34776,10 @@ index d7d25e6fb410..48204da0acde 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -29150,35 +34793,40 @@ index d7d25e6fb410..48204da0acde 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("g722_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-index 6d94e676bf69..7b6412d996cb 100644
+index 1ff9bdf07a4b..9871fbb1c38f 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -29187,7 +34835,7 @@ index 6d94e676bf69..7b6412d996cb 100644
FINAL_LIBRARY = "webrtc"
-@@ -108,171 +117,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -111,190 +120,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29195,7 +34843,7 @@ index 6d94e676bf69..7b6412d996cb 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -29240,6 +34888,7 @@ index 6d94e676bf69..7b6412d996cb 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -29298,6 +34947,24 @@ index 6d94e676bf69..7b6412d996cb 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -29330,8 +34997,7 @@ index 6d94e676bf69..7b6412d996cb 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CFLAGS += [
"-msse2"
]
@@ -29349,34 +35015,40 @@ index 6d94e676bf69..7b6412d996cb 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("ilbc_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-index 5fce348d4824..273799c130e0 100644
+index 4a7279386ee5..b1811c428dda 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -29385,7 +35057,7 @@ index 5fce348d4824..273799c130e0 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29393,7 +35065,7 @@ index 5fce348d4824..273799c130e0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -29438,6 +35110,7 @@ index 5fce348d4824..273799c130e0 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -29496,6 +35169,24 @@ index 5fce348d4824..273799c130e0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -29528,8 +35219,7 @@ index 5fce348d4824..273799c130e0 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -29547,34 +35237,40 @@ index 5fce348d4824..273799c130e0 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("ilbc_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index 0683c6b2c87f..7957e160f1cf 100644
+index bb9cdf4460c3..00d886763be2 100644
--- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -29583,7 +35279,7 @@ index 0683c6b2c87f..7957e160f1cf 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29591,7 +35287,7 @@ index 0683c6b2c87f..7957e160f1cf 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -29628,6 +35324,7 @@ index 0683c6b2c87f..7957e160f1cf 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -29675,6 +35372,22 @@ index 0683c6b2c87f..7957e160f1cf 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -29696,9 +35409,10 @@ index 0683c6b2c87f..7957e160f1cf 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 += [
@@ -29729,22 +35443,23 @@ index 0683c6b2c87f..7957e160f1cf 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("isac_bwinfo_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
-index eb1ef5acdda3..5e9603ecac08 100644
---- third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
+index 86f566663ad5..dbed4ddcb476 100644
+--- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -29753,7 +35468,7 @@ index eb1ef5acdda3..5e9603ecac08 100644
FINAL_LIBRARY = "webrtc"
-@@ -62,151 +71,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,175 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29761,7 +35476,7 @@ index eb1ef5acdda3..5e9603ecac08 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -29771,10 +35486,6 @@ index eb1ef5acdda3..5e9603ecac08 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -29799,14 +35510,10 @@ index eb1ef5acdda3..5e9603ecac08 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "m",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -29841,13 +35548,6 @@ index eb1ef5acdda3..5e9603ecac08 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":
@@ -29855,6 +35555,34 @@ index eb1ef5acdda3..5e9603ecac08 100644
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+- CFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -29879,9 +35607,15 @@ index eb1ef5acdda3..5e9603ecac08 100644
-
- 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":
-
+-
CFLAGS += [
"-msse2"
]
@@ -29894,35 +35628,45 @@ index eb1ef5acdda3..5e9603ecac08 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
- CFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("isac_c_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
-index c0022a8ed181..376fa6e9ca1b 100644
---- third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("isac_vad_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
+index b642ffbe952b..9c04c9bb3900 100644
+--- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -29931,7 +35675,7 @@ index c0022a8ed181..376fa6e9ca1b 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29939,7 +35683,7 @@ index c0022a8ed181..376fa6e9ca1b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -29980,6 +35724,7 @@ index c0022a8ed181..376fa6e9ca1b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -30027,10 +35772,32 @@ index c0022a8ed181..376fa6e9ca1b 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -30064,6 +35831,10 @@ index c0022a8ed181..376fa6e9ca1b 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -30077,30 +35848,40 @@ index c0022a8ed181..376fa6e9ca1b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("isac_common_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
-index fb8bd4934a8a..1e34d436dfaa 100644
---- third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("legacy_encoded_audio_frame_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+index 823aea6ddaa0..ecf6b3b2fde3 100644
+--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -30109,7 +35890,7 @@ index fb8bd4934a8a..1e34d436dfaa 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,151 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -78,190 +87,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30117,7 +35898,7 @@ index fb8bd4934a8a..1e34d436dfaa 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -30156,13 +35937,13 @@ index fb8bd4934a8a..1e34d436dfaa 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "m",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -30211,6 +35992,34 @@ index fb8bd4934a8a..1e34d436dfaa 100644
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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -30235,9 +36044,15 @@ index fb8bd4934a8a..1e34d436dfaa 100644
-
- 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"
]
@@ -30250,35 +36065,45 @@ index fb8bd4934a8a..1e34d436dfaa 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("isac_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index 32e0bdbeae79..225a9395949a 100644
---- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("neteq_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
+index 54863e95aee7..936368e4205a 100644
+--- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -30287,7 +36112,7 @@ index 32e0bdbeae79..225a9395949a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,156 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30295,7 +36120,7 @@ index 32e0bdbeae79..225a9395949a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -30332,6 +36157,7 @@ index 32e0bdbeae79..225a9395949a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -30383,6 +36209,24 @@ index 32e0bdbeae79..225a9395949a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -30416,10 +36260,10 @@ index 32e0bdbeae79..225a9395949a 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -30433,35 +36277,40 @@ index 32e0bdbeae79..225a9395949a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CFLAGS += [
- "-msse2"
- ]
+- CFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("isac_vad_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index 18350301d248..00bcac5bbb50 100644
---- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("pcm16b_c_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
+index afee108cb3a1..436a0dda6fd4 100644
+--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -30470,7 +36319,7 @@ index 18350301d248..00bcac5bbb50 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30478,7 +36327,7 @@ index 18350301d248..00bcac5bbb50 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -30519,6 +36368,7 @@ index 18350301d248..00bcac5bbb50 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -30574,6 +36424,24 @@ index 18350301d248..00bcac5bbb50 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -30607,10 +36475,10 @@ index 18350301d248..00bcac5bbb50 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -30624,35 +36492,40 @@ index 18350301d248..00bcac5bbb50 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("legacy_encoded_audio_frame_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-index 12652118fcd3..2e1db1d17b5b 100644
---- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("pcm16b_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
+index c4fa5c8bc4fe..7be902bc7b5d 100644
+--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -30661,7 +36534,7 @@ index 12652118fcd3..2e1db1d17b5b 100644
FINAL_LIBRARY = "webrtc"
-@@ -72,171 +81,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30669,7 +36542,7 @@ index 12652118fcd3..2e1db1d17b5b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -30714,6 +36587,7 @@ index 12652118fcd3..2e1db1d17b5b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -30772,6 +36646,24 @@ index 12652118fcd3..2e1db1d17b5b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -30804,8 +36696,7 @@ index 12652118fcd3..2e1db1d17b5b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -30823,34 +36714,40 @@ index 12652118fcd3..2e1db1d17b5b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("neteq_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index 0e1653a5e920..754b01f3934f 100644
---- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("red_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
+index 4a9c24069e74..ea61654f618e 100644
+--- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -30859,7 +36756,7 @@ index 0e1653a5e920..754b01f3934f 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30867,7 +36764,7 @@ index 0e1653a5e920..754b01f3934f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -30877,6 +36774,10 @@ index 0e1653a5e920..754b01f3934f 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -30901,9 +36802,14 @@ index 0e1653a5e920..754b01f3934f 100644
- 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_POSIX"] = True
@@ -30938,6 +36844,13 @@ index 0e1653a5e920..754b01f3934f 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":
@@ -30947,7 +36860,7 @@ index 0e1653a5e920..754b01f3934f 100644
-if CONFIG["CPU_ARCH"] == "arm":
-
-- CFLAGS += [
+- CXXFLAGS += [
- "-mfpu=neon"
- ]
-
@@ -30955,6 +36868,24 @@ index 0e1653a5e920..754b01f3934f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -30988,10 +36919,10 @@ index 0e1653a5e920..754b01f3934f 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -31005,35 +36936,43 @@ index 0e1653a5e920..754b01f3934f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("pcm16b_c_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index 9672bdd6e442..6d03ec66d70c 100644
---- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("webrtc_cng_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
+index 99ea47c13acc..1edab76c795b 100644
+--- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
+@@ -12,6 +12,9 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_CODEC_ILBC"] = True
+ DEFINES["WEBRTC_CODEC_OPUS"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+@@ -19,7 +22,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+ DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31042,7 +36981,7 @@ index 9672bdd6e442..6d03ec66d70c 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31050,7 +36989,7 @@ index 9672bdd6e442..6d03ec66d70c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -31091,6 +37030,7 @@ index 9672bdd6e442..6d03ec66d70c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -31146,6 +37086,24 @@ index 9672bdd6e442..6d03ec66d70c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -31179,10 +37137,10 @@ index 9672bdd6e442..6d03ec66d70c 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -31196,35 +37154,43 @@ index 9672bdd6e442..6d03ec66d70c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("pcm16b_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index 78fa81b88eb3..e7f3708a383b 100644
---- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("webrtc_multiopus_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
+index 49fb552b0d38..bdf1cbbf4c27 100644
+--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
+@@ -12,6 +12,9 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_CODEC_ILBC"] = True
+ DEFINES["WEBRTC_CODEC_OPUS"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+@@ -19,7 +22,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+ DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31233,7 +37199,7 @@ index 78fa81b88eb3..e7f3708a383b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31241,7 +37207,7 @@ index 78fa81b88eb3..e7f3708a383b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -31286,6 +37252,7 @@ index 78fa81b88eb3..e7f3708a383b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -31344,6 +37311,24 @@ index 78fa81b88eb3..e7f3708a383b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -31376,8 +37361,7 @@ index 78fa81b88eb3..e7f3708a383b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -31395,34 +37379,43 @@ index 78fa81b88eb3..e7f3708a383b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("red_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index 9bc743df7706..199c59179266 100644
---- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("webrtc_opus_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
+index 20e1d37306c9..604d2ff1160d 100644
+--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
++++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
+@@ -12,6 +12,9 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_CODEC_ILBC"] = True
+ DEFINES["WEBRTC_CODEC_OPUS"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+@@ -19,7 +22,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+ DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31431,7 +37424,7 @@ index 9bc743df7706..199c59179266 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31439,7 +37432,7 @@ index 9bc743df7706..199c59179266 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -31477,13 +37470,10 @@ index 9bc743df7706..199c59179266 100644
- 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_POSIX"] = True
@@ -31520,9 +37510,6 @@ index 9bc743df7706..199c59179266 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -31542,6 +37529,24 @@ index 9bc743df7706..199c59179266 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -31574,8 +37579,7 @@ index 9bc743df7706..199c59179266 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -31593,38 +37597,229 @@ index 9bc743df7706..199c59179266 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("webrtc_opus_wrapper_gn")
+diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
+index 40ed29f25814..101e685fa20c 100644
+--- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
++++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["OS_TARGET"] == "Darwin":
-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- Library("webrtc_cng_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index 4d11b7c7a093..3eb4470df234 100644
---- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-@@ -11,13 +11,23 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+-if CONFIG["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("audio_device_gn")
+diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
+index c6a45f9a3761..f1359947dd44 100644
+--- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
++++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_CODEC_ILBC"] = True
-+DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_CODEC_OPUS"] = 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_OPUS_SUPPORT_120MS_PTIME"] = "1"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31633,7 +37828,7 @@ index 4d11b7c7a093..3eb4470df234 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,185 +55,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31641,7 +37836,7 @@ index 4d11b7c7a093..3eb4470df234 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -31657,7 +37852,6 @@ index 4d11b7c7a093..3eb4470df234 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
@@ -31680,12 +37874,16 @@ index 4d11b7c7a093..3eb4470df234 100644
- 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_CODEC_ISAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
@@ -31701,7 +37899,6 @@ index 4d11b7c7a093..3eb4470df234 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -31721,6 +37918,9 @@ index 4d11b7c7a093..3eb4470df234 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -31738,12 +37938,25 @@ index 4d11b7c7a093..3eb4470df234 100644
-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_CODEC_ISACFX"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -31769,10 +37982,6 @@ index 4d11b7c7a093..3eb4470df234 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
--
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -31781,25 +37990,17 @@ index 4d11b7c7a093..3eb4470df234 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
--
- OS_LIBS += [
- "android_support"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
--
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
@@ -31807,40 +38008,41 @@ index 4d11b7c7a093..3eb4470df234 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("webrtc_multiopus_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index b3eddbf6d7e2..a32b4ffb35b1 100644
---- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-@@ -11,13 +11,23 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_frame_manipulator_gn")
+diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
+index 32a47e6b064d..44ff455cc768 100644
+--- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
++++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_CODEC_ILBC"] = True
-+DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_CODEC_OPUS"] = 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_OPUS_SUPPORT_120MS_PTIME"] = "1"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -31849,7 +38051,7 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,192 +55,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31857,7 +38059,7 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -31873,7 +38075,6 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
@@ -31903,9 +38104,9 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
@@ -31921,7 +38122,6 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -31961,12 +38161,25 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_CODEC_ISACFX"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -31992,10 +38205,6 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
--
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -32005,23 +38214,218 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("audio_mixer_impl_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
+index 60ecc93ab967..556de6ede5e6 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
-- "android_support"
+- "android_support",
+- "unwind"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+- OS_LIBS += [
+- "android_support"
+- ]
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
@@ -32029,41 +38433,31 @@ index b3eddbf6d7e2..a32b4ffb35b1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- Library("webrtc_opus_gn")
-diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index 0a9b82df14c1..29f3b1af626d 100644
---- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-@@ -11,13 +11,23 @@ AllowCompilerWarnings()
-
+ Library("adaptive_fir_filter_erl_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
+index fd78a435604d..aed93b9c682d 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_CODEC_ILBC"] = True
-+DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_CODEC_OPUS"] = 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_OPUS_SUPPORT_120MS_PTIME"] = "1"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -32072,7 +38466,7 @@ index 0a9b82df14c1..29f3b1af626d 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,185 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32080,7 +38474,7 @@ index 0a9b82df14c1..29f3b1af626d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -32096,7 +38490,6 @@ index 0a9b82df14c1..29f3b1af626d 100644
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
@@ -32119,12 +38512,16 @@ index 0a9b82df14c1..29f3b1af626d 100644
- 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_CODEC_ISAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
@@ -32140,7 +38537,6 @@ index 0a9b82df14c1..29f3b1af626d 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -32160,6 +38556,9 @@ index 0a9b82df14c1..29f3b1af626d 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -32171,19 +38570,26 @@ index 0a9b82df14c1..29f3b1af626d 100644
-if CONFIG["CPU_ARCH"] == "arm":
-
-- CXXFLAGS += [
-- "-mfpu=neon"
-- ]
--
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_CODEC_ISACFX"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+-if CONFIG["CPU_ARCH"] == "mips64":
-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -32205,20 +38611,188 @@ index 0a9b82df14c1..29f3b1af626d 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
-- DEFINES["USE_X11"] = "1"
+- OS_LIBS += [
+- "android_support",
+- "unwind"
+- ]
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+- OS_LIBS += [
+- "android_support"
+- ]
-
--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-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("adaptive_fir_filter_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
+index 6f67bd6fad7f..301dd09d6644 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
+@@ -17,13 +17,22 @@ CXXFLAGS += [
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++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"
+
+@@ -54,137 +63,16 @@ 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_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "android_support",
-- "unwind"
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_GNU_SOURCE"] = True
+- 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_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_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"
- ]
-
+-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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+if CONFIG["CPU_ARCH"] == "x86":
@@ -32226,19 +38800,193 @@ index 0a9b82df14c1..29f3b1af626d 100644
"-msse2"
]
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
--
- OS_LIBS += [
- "android_support"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++ DEFINES["USE_X11"] = "1"
+
+ Library("aec3_avx2_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
+index b0952a7d0cd8..8a9d53a1b709 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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_CODEC_ISAC"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
@@ -32247,35 +38995,30 @@ index 0a9b82df14c1..29f3b1af626d 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
-- DEFINES["WEBRTC_CODEC_ISAC"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- Library("webrtc_opus_wrapper_gn")
-diff --git third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
-index 398c2da306fc..d84c8dfb7952 100644
---- third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("aec3_common_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
+index 97bbc435395f..0fba9b70c95b 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -32284,7 +39027,7 @@ index 398c2da306fc..d84c8dfb7952 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32292,7 +39035,7 @@ index 398c2da306fc..d84c8dfb7952 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -32330,9 +39073,14 @@ index 398c2da306fc..d84c8dfb7952 100644
- 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_POSIX"] = True
@@ -32369,6 +39117,9 @@ index 398c2da306fc..d84c8dfb7952 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -32384,6 +39135,22 @@ index 398c2da306fc..d84c8dfb7952 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -32405,9 +39172,10 @@ index 398c2da306fc..d84c8dfb7952 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 += [
@@ -32437,23 +39205,25 @@ index 398c2da306fc..d84c8dfb7952 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_device_api_gn")
-diff --git third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
-index 1195b231c063..c7d7a8f581a8 100644
---- third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("aec3_fft_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
+index 6646d41ff3a8..b680faacb6b6 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = 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
@@ -32462,7 +39232,7 @@ index 1195b231c063..c7d7a8f581a8 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -100,190 +109,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32470,7 +39240,7 @@ index 1195b231c063..c7d7a8f581a8 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -32515,6 +39285,7 @@ index 1195b231c063..c7d7a8f581a8 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -32573,6 +39344,24 @@ index 1195b231c063..c7d7a8f581a8 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -32605,8 +39394,7 @@ index 1195b231c063..c7d7a8f581a8 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -32624,34 +39412,40 @@ index 1195b231c063..c7d7a8f581a8 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_device_buffer_gn")
-diff --git third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
-index 724e242ca3ef..cc391e065472 100644
---- third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("aec3_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
+index d77163999ba8..bbfd52a05ced 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -32660,7 +39454,7 @@ index 724e242ca3ef..cc391e065472 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32668,7 +39462,7 @@ index 724e242ca3ef..cc391e065472 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -32709,6 +39503,7 @@ index 724e242ca3ef..cc391e065472 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -32743,10 +39538,199 @@ index 724e242ca3ef..cc391e065472 100644
- 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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
-- "winmm"
+- "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("fft_data_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
+index bae4fa297266..af83e29c22cb 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
@@ -32760,6 +39744,22 @@ index 724e242ca3ef..cc391e065472 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -32781,9 +39781,203 @@ index 724e242ca3ef..cc391e065472 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("matched_filter_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
+index b7a10f5d7c88..8068d5e8b48a 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -32813,23 +40007,24 @@ index 724e242ca3ef..cc391e065472 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_device_default_gn")
-diff --git third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
-index f08e5c8e02b8..c446d2a6b6d2 100644
---- third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("render_buffer_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
+index 89ee0b6a8172..e2c6c18ff9e0 100644
+--- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -32838,7 +40033,7 @@ index f08e5c8e02b8..c446d2a6b6d2 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32846,7 +40041,7 @@ index f08e5c8e02b8..c446d2a6b6d2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -32884,13 +40079,203 @@ index f08e5c8e02b8..c446d2a6b6d2 100644
- 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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
- OS_LIBS += [
-- "rt"
+- "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("vector_math_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
+index 201cd58360cf..28209dac0b7d 100644
+--- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
- ]
-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_POSIX"] = True
@@ -32927,9 +40312,6 @@ index f08e5c8e02b8..c446d2a6b6d2 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -32941,14 +40323,26 @@ index f08e5c8e02b8..c446d2a6b6d2 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -32970,9 +40364,10 @@ index f08e5c8e02b8..c446d2a6b6d2 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 += [
@@ -32981,12 +40376,7 @@ index f08e5c8e02b8..c446d2a6b6d2 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -33001,33 +40391,30 @@ index f08e5c8e02b8..c446d2a6b6d2 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_device_generic_gn")
-diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index 0cfaae2eb2e9..be388a2ff7a8 100644
---- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("aec_dump_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
+index 974b70b087d2..e7cd5f585b83 100644
+--- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -33036,7 +40423,7 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,161 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33044,7 +40431,7 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -33055,7 +40442,6 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -33083,14 +40469,10 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -33127,9 +40509,6 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -33141,10 +40520,32 @@ index 0cfaae2eb2e9..be388a2ff7a8 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -33178,6 +40579,10 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -33191,31 +40596,40 @@ index 0cfaae2eb2e9..be388a2ff7a8 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_device_gn")
-diff --git third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-index 1f4c26e74a73..29823c0077d0 100644
---- third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("null_aec_dump_factory_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
+index 1c47bbd5cc1e..c51fcb7d6a97 100644
+--- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_DUMMY_AUDIO_BUILD"] = 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
@@ -33224,7 +40638,7 @@ index 1f4c26e74a73..29823c0077d0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,173 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33232,7 +40646,7 @@ index 1f4c26e74a73..29823c0077d0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -33243,7 +40657,6 @@ index 1f4c26e74a73..29823c0077d0 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -33271,14 +40684,10 @@ index 1f4c26e74a73..29823c0077d0 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -33315,9 +40724,6 @@ index 1f4c26e74a73..29823c0077d0 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -33337,6 +40743,24 @@ index 1f4c26e74a73..29823c0077d0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -33369,8 +40793,7 @@ index 1f4c26e74a73..29823c0077d0 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -33388,34 +40811,40 @@ index 1f4c26e74a73..29823c0077d0 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_device_impl_gn")
-diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index f514687c3e94..e876d26535ec 100644
---- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("aec_dump_interface_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
+index f0e41cd6bd08..9fec01cfbcec 100644
+--- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -33424,7 +40853,7 @@ index f514687c3e94..e876d26535ec 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,113 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33432,7 +40861,7 @@ index f514687c3e94..e876d26535ec 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -33446,6 +40875,10 @@ index f514687c3e94..e876d26535ec 100644
- "log"
- ]
-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -33455,6 +40888,10 @@ index f514687c3e94..e876d26535ec 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_AURA"] = "1"
@@ -33477,6 +40914,7 @@ index f514687c3e94..e876d26535ec 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -33486,6 +40924,10 @@ index f514687c3e94..e876d26535ec 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+-
-if CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@@ -33518,13 +40960,21 @@ index f514687c3e94..e876d26535ec 100644
- "secur32",
- "winmm"
- ]
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
- DEFINES["WEBRTC_ARCH_ARM64"] = True
+@@ -158,20 +61,7 @@ if CONFIG["CPU_ARCH"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
+ SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
+- ]
+-
-if CONFIG["CPU_ARCH"] == "arm":
-
- CXXFLAGS += [
@@ -33535,6 +40985,46 @@ index f514687c3e94..e876d26535ec 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+- SOURCES += [
++ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc",
+ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
+ ]
+
+@@ -179,7 +69,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+
+ SOURCES += [
+ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc"
+@@ -187,8 +76,6 @@ if CONFIG["CPU_ARCH"] == "mips32":
+
+ if CONFIG["CPU_ARCH"] == "mips64":
+
+- DEFINES["_GNU_SOURCE"] = True
+-
+ SOURCES += [
+ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+ ]
+@@ -199,95 +86,28 @@ if CONFIG["CPU_ARCH"] == "ppc64":
+ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+ ]
+
+-if CONFIG["CPU_ARCH"] == "riscv64":
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+-
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -33567,8 +41057,7 @@ index f514687c3e94..e876d26535ec 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -33581,33 +41070,54 @@ index f514687c3e94..e876d26535ec 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
+-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ SOURCES += [
+ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+ ]
+
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ SOURCES += [
+ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+ ]
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
- Library("audio_frame_manipulator_gn")
-diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index 65eb95889500..a65ae523f0d1 100644
---- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
+- SOURCES += [
+- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
+- ]
++ DEFINES["USE_X11"] = "1"
+ Library("aecm_core_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
+index 45e6cad30638..cafd3cc50045 100644
+--- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -33615,6 +41125,7 @@ index 65eb95889500..a65ae523f0d1 100644
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
@@ -33623,7 +41134,7 @@ index 65eb95889500..a65ae523f0d1 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,171 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33631,7 +41142,7 @@ index 65eb95889500..a65ae523f0d1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -33676,6 +41187,7 @@ index 65eb95889500..a65ae523f0d1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -33734,6 +41246,24 @@ index 65eb95889500..a65ae523f0d1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -33766,8 +41296,7 @@ index 65eb95889500..a65ae523f0d1 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -33785,34 +41314,40 @@ index 65eb95889500..a65ae523f0d1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_mixer_impl_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index b9b954b26e57..25cb3b9da185 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("agc_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
+index c6ab9b3160de..6cc48faee4a7 100644
+--- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -33821,7 +41356,7 @@ index b9b954b26e57..25cb3b9da185 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33829,7 +41364,7 @@ index b9b954b26e57..25cb3b9da185 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -33839,10 +41374,6 @@ index b9b954b26e57..25cb3b9da185 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -33870,6 +41401,7 @@ index b9b954b26e57..25cb3b9da185 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -33917,6 +41449,22 @@ index b9b954b26e57..25cb3b9da185 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -33938,9 +41486,10 @@ index b9b954b26e57..25cb3b9da185 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 += [
@@ -33970,23 +41519,24 @@ index b9b954b26e57..25cb3b9da185 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("adaptive_fir_filter_erl_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index 93cb37e76226..79eb1de244cf 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("gain_control_interface_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
+index 0188a8ac107e..364ef9950f2c 100644
+--- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -33995,7 +41545,7 @@ index 93cb37e76226..79eb1de244cf 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34003,7 +41553,7 @@ index 93cb37e76226..79eb1de244cf 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -34048,6 +41598,7 @@ index 93cb37e76226..79eb1de244cf 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -34098,10 +41649,32 @@ index 93cb37e76226..79eb1de244cf 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -34135,6 +41708,10 @@ index 93cb37e76226..79eb1de244cf 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -34148,31 +41725,40 @@ index 93cb37e76226..79eb1de244cf 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("adaptive_fir_filter_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index 60fff08a31fd..f268034294f9 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-@@ -16,11 +16,20 @@ CXXFLAGS += [
++ DEFINES["USE_X11"] = "1"
+ Library("legacy_agc_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
+index 9db9a639e7ae..865eee21cf92 100644
+--- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -34181,7 +41767,7 @@ index 60fff08a31fd..f268034294f9 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,133 +59,9 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34189,7 +41775,7 @@ index 60fff08a31fd..f268034294f9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -34222,7 +41808,6 @@ index 60fff08a31fd..f268034294f9 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -34235,6 +41820,7 @@ index 60fff08a31fd..f268034294f9 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -34276,6 +41862,40 @@ index 60fff08a31fd..f268034294f9 100644
- "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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -34287,8 +41907,8 @@ index 60fff08a31fd..f268034294f9 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
@@ -34301,37 +41921,67 @@ index 60fff08a31fd..f268034294f9 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
+- 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["_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":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index fde5dd657ee8..b0daf24ff4f4 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+ Library("level_estimation_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
+index 7d16c9a9f5c1..ab3f79521ab8 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = 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
@@ -34340,7 +41990,7 @@ index fde5dd657ee8..b0daf24ff4f4 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34348,7 +41998,7 @@ index fde5dd657ee8..b0daf24ff4f4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -34358,6 +42008,10 @@ index fde5dd657ee8..b0daf24ff4f4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -34382,9 +42036,14 @@ index fde5dd657ee8..b0daf24ff4f4 100644
- 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_POSIX"] = True
@@ -34419,6 +42078,13 @@ index fde5dd657ee8..b0daf24ff4f4 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":
@@ -34428,10 +42094,32 @@ index fde5dd657ee8..b0daf24ff4f4 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -34465,6 +42153,10 @@ index fde5dd657ee8..b0daf24ff4f4 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -34478,30 +42170,40 @@ index fde5dd657ee8..b0daf24ff4f4 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("aec3_common_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index 6d54ad479d4c..ce68a7e8b5c9 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("adaptive_digital_gain_controller_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
+index f396f42e5776..1d4e4aaebbe3 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -34510,7 +42212,7 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,159 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34518,7 +42220,7 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -34556,13 +42258,10 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644
- 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_POSIX"] = True
@@ -34597,13 +42296,6 @@ index 6d54ad479d4c..ce68a7e8b5c9 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":
@@ -34613,10 +42305,32 @@ index 6d54ad479d4c..ce68a7e8b5c9 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -34650,6 +42364,10 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -34663,31 +42381,40 @@ index 6d54ad479d4c..ce68a7e8b5c9 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("aec3_fft_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index 23619827e1e9..c5fdfa973bff 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("biquad_filter_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
+index 9cddd69abef4..fc59d2ead813 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -34696,7 +42423,7 @@ index 23619827e1e9..c5fdfa973bff 100644
FINAL_LIBRARY = "webrtc"
-@@ -94,171 +103,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34704,7 +42431,7 @@ index 23619827e1e9..c5fdfa973bff 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -34749,6 +42476,7 @@ index 23619827e1e9..c5fdfa973bff 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -34807,6 +42535,24 @@ index 23619827e1e9..c5fdfa973bff 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -34839,8 +42585,7 @@ index 23619827e1e9..c5fdfa973bff 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -34858,34 +42603,40 @@ index 23619827e1e9..c5fdfa973bff 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("aec3_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index 12998c4b029b..de798435bb2a 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("clipping_predictor_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
+index 274cae23a398..c4e0b45cf302 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -34894,7 +42645,7 @@ index 12998c4b029b..de798435bb2a 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34902,7 +42653,7 @@ index 12998c4b029b..de798435bb2a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -34912,10 +42663,6 @@ index 12998c4b029b..de798435bb2a 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -34943,6 +42690,7 @@ index 12998c4b029b..de798435bb2a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -34990,6 +42738,22 @@ index 12998c4b029b..de798435bb2a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -35011,9 +42775,10 @@ index 12998c4b029b..de798435bb2a 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 += [
@@ -35043,23 +42808,24 @@ index 12998c4b029b..de798435bb2a 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("fft_data_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index 363190680672..de7572325155 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("common_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
+index a4572251ad4c..6817471d99c1 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -35068,7 +42834,7 @@ index 363190680672..de7572325155 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35076,7 +42842,7 @@ index 363190680672..de7572325155 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -35114,9 +42880,14 @@ index 363190680672..de7572325155 100644
- 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_POSIX"] = True
@@ -35153,6 +42924,9 @@ index 363190680672..de7572325155 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -35164,10 +42938,32 @@ index 363190680672..de7572325155 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -35201,6 +42997,10 @@ index 363190680672..de7572325155 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -35214,30 +43014,41 @@ index 363190680672..de7572325155 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("matched_filter_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index 622012d48c36..8581270b776d 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("cpu_features_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
+index 3a54fc31711b..e87103152bc9 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = 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
@@ -35246,7 +43057,7 @@ index 622012d48c36..8581270b776d 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35254,7 +43065,7 @@ index 622012d48c36..8581270b776d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -35292,9 +43103,14 @@ index 622012d48c36..8581270b776d 100644
- 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_POSIX"] = True
@@ -35331,6 +43147,9 @@ index 622012d48c36..8581270b776d 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -35342,10 +43161,32 @@ index 622012d48c36..8581270b776d 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -35379,6 +43220,10 @@ index 622012d48c36..8581270b776d 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -35392,30 +43237,40 @@ index 622012d48c36..8581270b776d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("render_buffer_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index b4829b141af4..9b87c9644114 100644
---- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("fixed_digital_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
+index 394aa109faf3..cb41c74ad271 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -35424,7 +43279,7 @@ index b4829b141af4..9b87c9644114 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35432,7 +43287,7 @@ index b4829b141af4..9b87c9644114 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -35473,6 +43328,7 @@ index b4829b141af4..9b87c9644114 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -35516,10 +43372,32 @@ index b4829b141af4..9b87c9644114 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -35553,6 +43431,10 @@ index b4829b141af4..9b87c9644114 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -35566,30 +43448,40 @@ index b4829b141af4..9b87c9644114 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("vector_math_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index 1eb77fe2feac..63dc829e16f9 100644
---- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("gain_applier_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
+index 5b1d68415a52..32bf484b86e7 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -35598,7 +43490,7 @@ index 1eb77fe2feac..63dc829e16f9 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35606,7 +43498,7 @@ index 1eb77fe2feac..63dc829e16f9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -35616,10 +43508,6 @@ index 1eb77fe2feac..63dc829e16f9 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -35647,6 +43535,7 @@ index 1eb77fe2feac..63dc829e16f9 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -35681,10 +43570,6 @@ index 1eb77fe2feac..63dc829e16f9 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -35698,6 +43583,22 @@ index 1eb77fe2feac..63dc829e16f9 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -35719,9 +43620,10 @@ index 1eb77fe2feac..63dc829e16f9 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 += [
@@ -35751,23 +43653,25 @@ index 1eb77fe2feac..63dc829e16f9 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("aec_dump_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index 49b34c44cb0e..9538a5c9889c 100644
---- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("gain_map_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
+index 582eb326f3d6..8fa3a2bba795 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = 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
@@ -35776,7 +43680,7 @@ index 49b34c44cb0e..9538a5c9889c 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35784,7 +43688,7 @@ index 49b34c44cb0e..9538a5c9889c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -35822,9 +43726,14 @@ index 49b34c44cb0e..9538a5c9889c 100644
- 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_POSIX"] = True
@@ -35861,6 +43770,9 @@ index 49b34c44cb0e..9538a5c9889c 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -35880,6 +43792,24 @@ index 49b34c44cb0e..9538a5c9889c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -35913,10 +43843,10 @@ index 49b34c44cb0e..9538a5c9889c 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -35930,35 +43860,40 @@ index 49b34c44cb0e..9538a5c9889c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("null_aec_dump_factory_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 65b987429c4e..af94e6384a52 100644
---- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("input_volume_controller_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
+index 5a662f407985..c92be24aa407 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -35967,7 +43902,7 @@ index 65b987429c4e..af94e6384a52 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35975,7 +43910,7 @@ index 65b987429c4e..af94e6384a52 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -36016,6 +43951,7 @@ index 65b987429c4e..af94e6384a52 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -36071,6 +44007,24 @@ index 65b987429c4e..af94e6384a52 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -36104,10 +44058,10 @@ index 65b987429c4e..af94e6384a52 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -36121,35 +44075,41 @@ index 65b987429c4e..af94e6384a52 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("aec_dump_interface_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index f317d9be88ee..84883d3dddda 100644
---- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("input_volume_stats_reporter_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
+index ba000d386223..21a9e8b6511a 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = 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
@@ -36158,7 +44118,7 @@ index f317d9be88ee..84883d3dddda 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,96 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36166,7 +44126,7 @@ index f317d9be88ee..84883d3dddda 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -36211,6 +44171,7 @@ index f317d9be88ee..84883d3dddda 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -36256,9 +44217,8 @@ index f317d9be88ee..84883d3dddda 100644
if CONFIG["CPU_ARCH"] == "aarch64":
-@@ -142,79 +62,10 @@ if CONFIG["CPU_ARCH"] == "aarch64":
- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
- ]
+ DEFINES["WEBRTC_ARCH_ARM64"] = True
+ DEFINES["WEBRTC_HAS_NEON"] = True
-if CONFIG["CPU_ARCH"] == "arm":
-
@@ -36270,9 +44230,23 @@ index f317d9be88ee..84883d3dddda 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
-- SOURCES += [
-- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
-- ]
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -36306,8 +44280,7 @@ index f317d9be88ee..84883d3dddda 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -36325,35 +44298,40 @@ index f317d9be88ee..84883d3dddda 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("aecm_core_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index ff59d4de4fb8..7feca48963aa 100644
---- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("noise_level_estimator_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
+index 3f00e43e7c28..87c64337304c 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -36362,7 +44340,7 @@ index ff59d4de4fb8..7feca48963aa 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36370,7 +44348,7 @@ index ff59d4de4fb8..7feca48963aa 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -36415,6 +44393,7 @@ index ff59d4de4fb8..7feca48963aa 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -36473,6 +44452,24 @@ index ff59d4de4fb8..7feca48963aa 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -36505,8 +44502,7 @@ index ff59d4de4fb8..7feca48963aa 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -36524,34 +44520,40 @@ index ff59d4de4fb8..7feca48963aa 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("agc_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index 7efc673f0c5b..27c920d237c5 100644
---- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rnn_vad_auto_correlation_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
+index 64d3371d81b0..bd147bc9f851 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -36560,7 +44562,7 @@ index 7efc673f0c5b..27c920d237c5 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36568,7 +44570,7 @@ index 7efc673f0c5b..27c920d237c5 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -36578,6 +44580,10 @@ index 7efc673f0c5b..27c920d237c5 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -36602,9 +44608,14 @@ index 7efc673f0c5b..27c920d237c5 100644
- 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_POSIX"] = True
@@ -36639,6 +44650,13 @@ index 7efc673f0c5b..27c920d237c5 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":
@@ -36652,6 +44670,22 @@ index 7efc673f0c5b..27c920d237c5 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -36673,9 +44707,10 @@ index 7efc673f0c5b..27c920d237c5 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 += [
@@ -36705,23 +44740,24 @@ index 7efc673f0c5b..27c920d237c5 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("gain_control_interface_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build
-index 6728434078cf..fde6cf4827d4 100644
---- third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("rnn_vad_common_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
+index 82e5302312e5..ef8d61998fa0 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -36730,7 +44766,7 @@ index 6728434078cf..fde6cf4827d4 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36738,7 +44774,7 @@ index 6728434078cf..fde6cf4827d4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -36748,6 +44784,10 @@ index 6728434078cf..fde6cf4827d4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -36772,9 +44812,14 @@ index 6728434078cf..fde6cf4827d4 100644
- 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_POSIX"] = True
@@ -36809,6 +44854,13 @@ index 6728434078cf..fde6cf4827d4 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":
@@ -36818,10 +44870,32 @@ index 6728434078cf..fde6cf4827d4 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -36855,6 +44929,10 @@ index 6728434078cf..fde6cf4827d4 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -36868,30 +44946,40 @@ index 6728434078cf..fde6cf4827d4 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("gain_map_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index 270cb5d3a7c7..c9336e1e4b32 100644
---- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rnn_vad_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
+index 7dd4619965ab..63049c23fc5e 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -36900,7 +44988,7 @@ index 270cb5d3a7c7..c9336e1e4b32 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36908,7 +44996,7 @@ index 270cb5d3a7c7..c9336e1e4b32 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -36953,6 +45041,7 @@ index 270cb5d3a7c7..c9336e1e4b32 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -37011,6 +45100,24 @@ index 270cb5d3a7c7..c9336e1e4b32 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -37043,8 +45150,7 @@ index 270cb5d3a7c7..c9336e1e4b32 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -37062,34 +45168,40 @@ index 270cb5d3a7c7..c9336e1e4b32 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("legacy_agc_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index befd830a176c..d4678106bbb7 100644
---- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rnn_vad_layers_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
+index 1fcbbbe408fa..ebc5b9a10d04 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -37098,7 +45210,7 @@ index befd830a176c..d4678106bbb7 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,171 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37106,7 +45218,7 @@ index befd830a176c..d4678106bbb7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -37144,13 +45256,10 @@ index befd830a176c..d4678106bbb7 100644
- 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_POSIX"] = True
@@ -37185,13 +45294,6 @@ index befd830a176c..d4678106bbb7 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":
@@ -37209,6 +45311,24 @@ index befd830a176c..d4678106bbb7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -37241,8 +45361,7 @@ index befd830a176c..d4678106bbb7 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -37260,35 +45379,40 @@ index befd830a176c..d4678106bbb7 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("level_estimation_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
-index d303a108d72b..804d6d990568 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rnn_vad_lp_residual_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
+index 6a69de9e292e..3d0349fab510 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -37297,7 +45421,7 @@ index d303a108d72b..804d6d990568 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37305,7 +45429,7 @@ index d303a108d72b..804d6d990568 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -37350,6 +45474,7 @@ index d303a108d72b..804d6d990568 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -37408,6 +45533,24 @@ index d303a108d72b..804d6d990568 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -37440,8 +45583,7 @@ index d303a108d72b..804d6d990568 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -37459,34 +45601,40 @@ index d303a108d72b..804d6d990568 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("adaptive_digital_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index d0bfd82c2350..8b176cf0be5c 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rnn_vad_pitch_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
+index d2a4eb7261b6..1a81378e66f5 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -37495,7 +45643,7 @@ index d0bfd82c2350..8b176cf0be5c 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37503,7 +45651,7 @@ index d0bfd82c2350..8b176cf0be5c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -37544,6 +45692,7 @@ index d0bfd82c2350..8b176cf0be5c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -37578,10 +45727,6 @@ index d0bfd82c2350..8b176cf0be5c 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -37591,14 +45736,26 @@ index d0bfd82c2350..8b176cf0be5c 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -37620,9 +45777,10 @@ index d0bfd82c2350..8b176cf0be5c 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 += [
@@ -37632,10 +45790,6 @@ index d0bfd82c2350..8b176cf0be5c 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -37649,35 +45803,31 @@ index d0bfd82c2350..8b176cf0be5c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("biquad_filter_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index 5ff8ddf35df1..01e415267019 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("rnn_vad_ring_buffer_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
+index c6913470c362..916932ccba9a 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -37686,7 +45836,7 @@ index 5ff8ddf35df1..01e415267019 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37694,7 +45844,7 @@ index 5ff8ddf35df1..01e415267019 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -37735,6 +45885,7 @@ index 5ff8ddf35df1..01e415267019 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -37769,10 +45920,6 @@ index 5ff8ddf35df1..01e415267019 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -37782,14 +45929,26 @@ index 5ff8ddf35df1..01e415267019 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -37811,9 +45970,10 @@ index 5ff8ddf35df1..01e415267019 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 += [
@@ -37823,10 +45983,6 @@ index 5ff8ddf35df1..01e415267019 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -37840,36 +45996,31 @@ index 5ff8ddf35df1..01e415267019 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("common_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index 5791bea212ad..01762efb5d8e 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+ Library("rnn_vad_sequence_buffer_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
+index 8298c7e091d7..db6f13136c47 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -37878,7 +46029,7 @@ index 5791bea212ad..01762efb5d8e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,171 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37886,7 +46037,7 @@ index 5791bea212ad..01762efb5d8e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -37931,6 +46082,7 @@ index 5791bea212ad..01762efb5d8e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -37989,6 +46141,24 @@ index 5791bea212ad..01762efb5d8e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -38021,8 +46191,7 @@ index 5791bea212ad..01762efb5d8e 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -38040,34 +46209,40 @@ index 5791bea212ad..01762efb5d8e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("fixed_digital_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index d4ffe13d2d76..ff7d3128f91e 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rnn_vad_spectral_features_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
+index acb933045439..e9cb91b4da31 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -38076,7 +46251,7 @@ index d4ffe13d2d76..ff7d3128f91e 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38084,7 +46259,7 @@ index d4ffe13d2d76..ff7d3128f91e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -38125,6 +46300,7 @@ index d4ffe13d2d76..ff7d3128f91e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -38159,10 +46335,6 @@ index d4ffe13d2d76..ff7d3128f91e 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -38172,14 +46344,26 @@ index d4ffe13d2d76..ff7d3128f91e 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -38201,9 +46385,10 @@ index d4ffe13d2d76..ff7d3128f91e 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 += [
@@ -38213,10 +46398,6 @@ index d4ffe13d2d76..ff7d3128f91e 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -38230,36 +46411,198 @@ index d4ffe13d2d76..ff7d3128f91e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ Library("rnn_vad_symmetric_matrix_buffer_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
+index 275c512cf6bb..d8f9ba076c5f 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
+@@ -17,12 +17,21 @@ CXXFLAGS += [
+ 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
- CXXFLAGS += [
- "-msse2"
- ]
+ FINAL_LIBRARY = "webrtc"
+@@ -49,137 +58,16 @@ 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_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- Library("gain_applier_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build
-index 27a0931eab96..8067136a0adb 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/level_estimation_agc_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
+- 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_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_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"
+- ]
+-
+-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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
+- OS_LIBS += [
+- "android_support"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++ DEFINES["USE_X11"] = "1"
+ Library("vector_math_avx2_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
+index 263ec679e37d..e2c6c18ff9e0 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
- DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -38268,7 +46611,7 @@ index 27a0931eab96..8067136a0adb 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38276,7 +46619,7 @@ index 27a0931eab96..8067136a0adb 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -38321,6 +46664,7 @@ index 27a0931eab96..8067136a0adb 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -38371,14 +46715,26 @@ index 27a0931eab96..8067136a0adb 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -38400,9 +46756,10 @@ index 27a0931eab96..8067136a0adb 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 += [
@@ -38411,12 +46768,7 @@ index 27a0931eab96..8067136a0adb 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -38431,27 +46783,23 @@ index 27a0931eab96..8067136a0adb 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("level_estimation_agc_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index 1076a2eaf57a..a71d81648a14 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+ Library("vector_math_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
+index a1e6f309bffa..934bd6d2cdd2 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -38459,6 +46807,7 @@ index 1076a2eaf57a..a71d81648a14 100644
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
@@ -38467,7 +46816,7 @@ index 1076a2eaf57a..a71d81648a14 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38475,7 +46824,7 @@ index 1076a2eaf57a..a71d81648a14 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -38520,6 +46869,7 @@ index 1076a2eaf57a..a71d81648a14 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -38578,6 +46928,24 @@ index 1076a2eaf57a..a71d81648a14 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -38610,8 +46978,7 @@ index 1076a2eaf57a..a71d81648a14 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -38629,34 +46996,41 @@ index 1076a2eaf57a..a71d81648a14 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("noise_level_estimator_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index eef4b67a679a..295a08f917af 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("saturation_protector_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
+index bb1dbc67b847..ad6f735a2729 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = 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
@@ -38665,7 +47039,7 @@ index eef4b67a679a..295a08f917af 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,171 +57,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38673,7 +47047,7 @@ index eef4b67a679a..295a08f917af 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -38718,6 +47092,7 @@ index eef4b67a679a..295a08f917af 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -38776,6 +47151,24 @@ index eef4b67a679a..295a08f917af 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -38808,8 +47201,7 @@ index eef4b67a679a..295a08f917af 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -38827,34 +47219,40 @@ index eef4b67a679a..295a08f917af 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rnn_vad_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build
-index 7f05fd14ac56..587b43f2d065 100644
---- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad_with_level_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("speech_level_estimator_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
+index dfa276510899..9f02e46a59fd 100644
+--- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -38863,7 +47261,7 @@ index 7f05fd14ac56..587b43f2d065 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38871,7 +47269,7 @@ index 7f05fd14ac56..587b43f2d065 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -38916,6 +47314,7 @@ index 7f05fd14ac56..587b43f2d065 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -38974,6 +47373,24 @@ index 7f05fd14ac56..587b43f2d065 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -39006,8 +47423,7 @@ index 7f05fd14ac56..587b43f2d065 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -39025,34 +47441,40 @@ index 7f05fd14ac56..587b43f2d065 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rnn_vad_with_level_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("vad_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-index bf4851218d28..9768dd4f7525 100644
+index 7f1c48ac391e..d6226679c01e 100644
--- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -39061,7 +47483,7 @@ index bf4851218d28..9768dd4f7525 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39069,7 +47491,7 @@ index bf4851218d28..9768dd4f7525 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -39110,6 +47532,7 @@ index bf4851218d28..9768dd4f7525 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -39165,6 +47588,24 @@ index bf4851218d28..9768dd4f7525 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -39198,10 +47639,10 @@ index bf4851218d28..9768dd4f7525 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -39215,29 +47656,33 @@ index bf4851218d28..9768dd4f7525 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index 64e2efdac206..3e75e671af25 100644
+index b6d96414b469..7a4060eadad0 100644
--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39245,6 +47690,7 @@ index 64e2efdac206..3e75e671af25 100644
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
@@ -39253,7 +47699,7 @@ index 64e2efdac206..3e75e671af25 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39261,7 +47707,7 @@ index 64e2efdac206..3e75e671af25 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -39306,6 +47752,7 @@ index 64e2efdac206..3e75e671af25 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -39364,6 +47811,24 @@ index 64e2efdac206..3e75e671af25 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -39396,8 +47861,7 @@ index 64e2efdac206..3e75e671af25 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -39415,28 +47879,33 @@ index 64e2efdac206..3e75e671af25 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("apm_logging_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index d9d1873676a1..7c0fa698eb08 100644
+index 2291d2981df8..a6e68e27491a 100644
--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39444,6 +47913,7 @@ index d9d1873676a1..7c0fa698eb08 100644
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
@@ -39452,7 +47922,7 @@ index d9d1873676a1..7c0fa698eb08 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,171 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39460,7 +47930,7 @@ index d9d1873676a1..7c0fa698eb08 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -39505,6 +47975,7 @@ index d9d1873676a1..7c0fa698eb08 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -39563,6 +48034,24 @@ index d9d1873676a1..7c0fa698eb08 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -39595,8 +48084,7 @@ index d9d1873676a1..7c0fa698eb08 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -39614,34 +48102,40 @@ index d9d1873676a1..7c0fa698eb08 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index bebdf8902351..4699f0504d43 100644
+index 683d86e74389..d0b535438023 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -39650,7 +48144,7 @@ index bebdf8902351..4699f0504d43 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39658,7 +48152,7 @@ index bebdf8902351..4699f0504d43 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -39699,6 +48193,7 @@ index bebdf8902351..4699f0504d43 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -39754,6 +48249,24 @@ index bebdf8902351..4699f0504d43 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -39787,10 +48300,10 @@ index bebdf8902351..4699f0504d43 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -39804,35 +48317,40 @@ index bebdf8902351..4699f0504d43 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_frame_proxies_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index 4eab83119b7c..8d57efca831b 100644
+index 9b90bca379fd..af0fce3d5e23 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -39841,7 +48359,7 @@ index 4eab83119b7c..8d57efca831b 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39849,7 +48367,7 @@ index 4eab83119b7c..8d57efca831b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -39890,6 +48408,7 @@ index 4eab83119b7c..8d57efca831b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -39937,6 +48456,22 @@ index 4eab83119b7c..8d57efca831b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -39958,9 +48493,10 @@ index 4eab83119b7c..8d57efca831b 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 += [
@@ -39992,15 +48528,15 @@ index 4eab83119b7c..8d57efca831b 100644
-
Library("audio_frame_view_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index 9aa3972d9a7a..d61b41ff3dec 100644
+index ab0ca7113f60..f5628add5044 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -40008,6 +48544,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644
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
@@ -40016,7 +48553,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,171 +64,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40024,7 +48561,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -40069,6 +48606,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -40127,6 +48665,24 @@ index 9aa3972d9a7a..d61b41ff3dec 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -40159,8 +48715,7 @@ index 9aa3972d9a7a..d61b41ff3dec 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -40178,34 +48733,40 @@ index 9aa3972d9a7a..d61b41ff3dec 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-index 9dc4eaa94e7c..6359c290f11f 100644
+index f0af20c33521..0e0173197c5f 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -40214,7 +48775,7 @@ index 9dc4eaa94e7c..6359c290f11f 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40222,7 +48783,7 @@ index 9dc4eaa94e7c..6359c290f11f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -40259,6 +48820,7 @@ index 9dc4eaa94e7c..6359c290f11f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -40310,6 +48872,24 @@ index 9dc4eaa94e7c..6359c290f11f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -40343,10 +48923,10 @@ index 9dc4eaa94e7c..6359c290f11f 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -40360,35 +48940,40 @@ index 9dc4eaa94e7c..6359c290f11f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("audio_processing_statistics_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/config_gn/moz.build third_party/libwebrtc/modules/audio_processing/config_gn/moz.build
-index 985e8a18b2fb..51aefb103374 100644
---- third_party/libwebrtc/modules/audio_processing/config_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("audio_processing_statistics_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
+index 3e57c48b6fc4..3ceff91af48f 100644
+--- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -40397,7 +48982,7 @@ index 985e8a18b2fb..51aefb103374 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40405,7 +48990,7 @@ index 985e8a18b2fb..51aefb103374 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -40415,6 +49000,10 @@ index 985e8a18b2fb..51aefb103374 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -40439,9 +49028,14 @@ index 985e8a18b2fb..51aefb103374 100644
- 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_POSIX"] = True
@@ -40476,6 +49070,13 @@ index 985e8a18b2fb..51aefb103374 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":
@@ -40493,6 +49094,24 @@ index 985e8a18b2fb..51aefb103374 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -40526,10 +49145,10 @@ index 985e8a18b2fb..51aefb103374 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -40543,35 +49162,263 @@ index 985e8a18b2fb..51aefb103374 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("capture_levels_adjuster_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+index fcbe873d276a..f87fc5607282 100644
+--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+@@ -12,12 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
+ DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
++DEFINES["WEBRTC_BSD"] = 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"
+
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("config_gn")
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("gain_controller2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index 288bc97f7b77..39bc69e1dd6f 100644
+index 4c8aac9c3dad..28352a6c74f4 100644
--- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -40580,7 +49427,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40588,7 +49435,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -40633,6 +49480,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -40691,6 +49539,24 @@ index 288bc97f7b77..39bc69e1dd6f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -40723,8 +49589,7 @@ index 288bc97f7b77..39bc69e1dd6f 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -40742,28 +49607,33 @@ index 288bc97f7b77..39bc69e1dd6f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("high_pass_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index 83f15c9be09c..1c5e7d3c511f 100644
+index 12076eedcb58..467f6e1046bb 100644
--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -40771,6 +49641,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644
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
@@ -40779,7 +49650,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,171 +62,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40787,7 +49658,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -40832,6 +49703,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -40890,6 +49762,24 @@ index 83f15c9be09c..1c5e7d3c511f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -40922,8 +49812,7 @@ index 83f15c9be09c..1c5e7d3c511f 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -40941,34 +49830,40 @@ index 83f15c9be09c..1c5e7d3c511f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("ns_gn")
diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-index a86d75480786..8d35968f1bd0 100644
+index 3e4fa4ca518f..3bd588630b7e 100644
--- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -40977,7 +49872,7 @@ index a86d75480786..8d35968f1bd0 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40985,7 +49880,7 @@ index a86d75480786..8d35968f1bd0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -41030,6 +49925,7 @@ index a86d75480786..8d35968f1bd0 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -41088,6 +49984,24 @@ index a86d75480786..8d35968f1bd0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -41120,8 +50034,7 @@ index a86d75480786..8d35968f1bd0 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -41139,34 +50052,40 @@ index a86d75480786..8d35968f1bd0 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("optionally_built_submodule_creators_gn")
diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index 734ed34f2a42..dd6560fc9538 100644
+index ec35734b6dfc..de1436046491 100644
--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -41175,7 +50094,7 @@ index 734ed34f2a42..dd6560fc9538 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41183,7 +50102,7 @@ index 734ed34f2a42..dd6560fc9538 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -41224,6 +50143,7 @@ index 734ed34f2a42..dd6560fc9538 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -41275,6 +50195,24 @@ index 734ed34f2a42..dd6560fc9538 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -41307,8 +50245,7 @@ index 734ed34f2a42..dd6560fc9538 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -41326,34 +50263,40 @@ index 734ed34f2a42..dd6560fc9538 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rms_level_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
-index 910a0f6b47e4..b6bf952b030e 100644
+index 5988e89a6a2a..5b680cbdd1fb 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -41362,7 +50305,7 @@ index 910a0f6b47e4..b6bf952b030e 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41370,7 +50313,7 @@ index 910a0f6b47e4..b6bf952b030e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -41407,6 +50350,7 @@ index 910a0f6b47e4..b6bf952b030e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -41454,6 +50398,22 @@ index 910a0f6b47e4..b6bf952b030e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -41475,9 +50435,10 @@ index 910a0f6b47e4..b6bf952b030e 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 += [
@@ -41509,21 +50470,22 @@ index 910a0f6b47e4..b6bf952b030e 100644
-
Library("transient_suppressor_api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-index 01778a276399..4918c1ac774c 100644
+index ee6b82a2f629..d7a2d68e8bf0 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -41532,7 +50494,7 @@ index 01778a276399..4918c1ac774c 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,171 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41540,7 +50502,7 @@ index 01778a276399..4918c1ac774c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -41585,6 +50547,7 @@ index 01778a276399..4918c1ac774c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -41643,6 +50606,24 @@ index 01778a276399..4918c1ac774c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -41675,8 +50656,7 @@ index 01778a276399..4918c1ac774c 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -41694,34 +50674,40 @@ index 01778a276399..4918c1ac774c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("transient_suppressor_impl_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index e916a2df4b02..74b2bad9a646 100644
---- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("transient_suppressor_impl_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
+index e2abcb849006..6deaa3bbf6a4 100644
+--- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -41730,7 +50716,7 @@ index e916a2df4b02..74b2bad9a646 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41738,7 +50724,7 @@ index e916a2df4b02..74b2bad9a646 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -41779,6 +50765,7 @@ index e916a2df4b02..74b2bad9a646 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -41830,6 +50817,24 @@ index e916a2df4b02..74b2bad9a646 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -41862,8 +50867,7 @@ index e916a2df4b02..74b2bad9a646 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -41881,34 +50885,40 @@ index e916a2df4b02..74b2bad9a646 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("cascaded_biquad_filter_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index ba9ff2aa76c9..7b0c7aeda6d3 100644
---- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("voice_probability_delay_unit_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+index 8cf3aaefeb48..ae86ec0ff176 100644
+--- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -41917,7 +50927,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,160 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41925,7 +50935,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -41966,6 +50976,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -42017,6 +51028,24 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -42049,8 +51078,7 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -42068,34 +51096,40 @@ index ba9ff2aa76c9..7b0c7aeda6d3 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("legacy_delay_estimator_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index 1884650643cd..80a7f1aa597c 100644
---- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("cascaded_biquad_filter_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
+index 11294e2aefb8..0d5e4b712c18 100644
+--- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -42104,7 +51138,7 @@ index 1884650643cd..80a7f1aa597c 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42112,7 +51146,7 @@ index 1884650643cd..80a7f1aa597c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -42153,6 +51187,7 @@ index 1884650643cd..80a7f1aa597c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -42204,6 +51239,24 @@ index 1884650643cd..80a7f1aa597c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -42236,8 +51289,7 @@ index 1884650643cd..80a7f1aa597c 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -42255,34 +51307,40 @@ index 1884650643cd..80a7f1aa597c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("pffft_wrapper_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index e06accb998fa..af94a933e998 100644
---- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("legacy_delay_estimator_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
+index 02898359bf06..7d5ad6e0e09e 100644
+--- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -42291,7 +51349,7 @@ index e06accb998fa..af94a933e998 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,171 +56,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42299,7 +51357,7 @@ index e06accb998fa..af94a933e998 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -42337,13 +51395,10 @@ index e06accb998fa..af94a933e998 100644
- 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_POSIX"] = True
@@ -42378,13 +51433,6 @@ index e06accb998fa..af94a933e998 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":
@@ -42402,6 +51450,24 @@ index e06accb998fa..af94a933e998 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -42434,8 +51500,7 @@ index e06accb998fa..af94a933e998 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -42453,34 +51518,40 @@ index e06accb998fa..af94a933e998 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("vad_gn")
-diff --git third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build
-index 8ef40909b1e9..b37740d287d3 100644
---- third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build
-+++ third_party/libwebrtc/modules/audio_processing/voice_detection_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("pffft_wrapper_gn")
+diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
+index 0e76427c6e5f..b452ab92154e 100644
+--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
++++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -42489,7 +51560,7 @@ index 8ef40909b1e9..b37740d287d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42497,7 +51568,7 @@ index 8ef40909b1e9..b37740d287d3 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -42542,6 +51613,7 @@ index 8ef40909b1e9..b37740d287d3 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -42600,6 +51672,24 @@ index 8ef40909b1e9..b37740d287d3 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -42632,8 +51722,7 @@ index 8ef40909b1e9..b37740d287d3 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -42651,34 +51740,40 @@ index 8ef40909b1e9..b37740d287d3 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("voice_detection_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("vad_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index 2d13d2a8ca67..956a4127a8d7 100644
+index 9633f1ef4819..02587d185dd1 100644
--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-@@ -12,10 +12,19 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -42687,7 +51782,7 @@ index 2d13d2a8ca67..956a4127a8d7 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42695,7 +51790,7 @@ index 2d13d2a8ca67..956a4127a8d7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -42706,7 +51801,6 @@ index 2d13d2a8ca67..956a4127a8d7 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -42735,13 +51829,13 @@ index 2d13d2a8ca67..956a4127a8d7 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -42800,6 +51894,24 @@ index 2d13d2a8ca67..956a4127a8d7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -42832,8 +51944,7 @@ index 2d13d2a8ca67..956a4127a8d7 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -42851,34 +51962,40 @@ index 2d13d2a8ca67..956a4127a8d7 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("congestion_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index a991b965ece6..1f7427c15bc5 100644
+index f6520bf35800..0b35f2f82c75 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -42887,7 +52004,7 @@ index a991b965ece6..1f7427c15bc5 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42895,7 +52012,7 @@ index a991b965ece6..1f7427c15bc5 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -42936,6 +52053,7 @@ index a991b965ece6..1f7427c15bc5 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -42991,6 +52109,24 @@ index a991b965ece6..1f7427c15bc5 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -43024,10 +52160,10 @@ index a991b965ece6..1f7427c15bc5 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -43041,35 +52177,40 @@ index a991b965ece6..1f7427c15bc5 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("alr_detector_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index 1b862f9fa48b..29a0679b9078 100644
+index 15f5a583ef24..ff1a426bf5d3 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-@@ -12,10 +12,19 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -43078,7 +52219,7 @@ index 1b862f9fa48b..29a0679b9078 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43086,7 +52227,7 @@ index 1b862f9fa48b..29a0679b9078 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -43097,7 +52238,6 @@ index 1b862f9fa48b..29a0679b9078 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -43126,13 +52266,13 @@ index 1b862f9fa48b..29a0679b9078 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -43191,6 +52331,24 @@ index 1b862f9fa48b..29a0679b9078 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -43223,8 +52381,7 @@ index 1b862f9fa48b..29a0679b9078 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -43242,34 +52399,40 @@ index 1b862f9fa48b..29a0679b9078 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("delay_based_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index 49b461e41162..9e29632b8847 100644
+index b15062af41c8..3e8439f74637 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-@@ -12,10 +12,19 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -43278,7 +52441,7 @@ index 49b461e41162..9e29632b8847 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,173 +55,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43286,7 +52449,7 @@ index 49b461e41162..9e29632b8847 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -43297,7 +52460,6 @@ index 49b461e41162..9e29632b8847 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -43326,13 +52488,13 @@ index 49b461e41162..9e29632b8847 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -43391,6 +52553,24 @@ index 49b461e41162..9e29632b8847 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -43423,8 +52603,7 @@ index 49b461e41162..9e29632b8847 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -43442,34 +52621,40 @@ index 49b461e41162..9e29632b8847 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("estimators_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index df17f5d59fe4..617906387e5d 100644
+index 973d4bf32fab..49adaa09b004 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-@@ -12,10 +12,19 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -43478,7 +52663,7 @@ index df17f5d59fe4..617906387e5d 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43486,7 +52671,7 @@ index df17f5d59fe4..617906387e5d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -43497,7 +52682,6 @@ index df17f5d59fe4..617906387e5d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -43526,13 +52710,13 @@ index df17f5d59fe4..617906387e5d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -43591,6 +52775,24 @@ index df17f5d59fe4..617906387e5d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -43623,8 +52825,7 @@ index df17f5d59fe4..617906387e5d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -43642,34 +52843,40 @@ index df17f5d59fe4..617906387e5d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("goog_cc_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index 90860d224cff..2e6f3c2b7f72 100644
+index 829ff47d87db..3f777466098c 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -43678,7 +52885,7 @@ index 90860d224cff..2e6f3c2b7f72 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43686,7 +52893,7 @@ index 90860d224cff..2e6f3c2b7f72 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -43727,6 +52934,7 @@ index 90860d224cff..2e6f3c2b7f72 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -43778,6 +52986,24 @@ index 90860d224cff..2e6f3c2b7f72 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -43810,8 +53036,7 @@ index 90860d224cff..2e6f3c2b7f72 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -43829,34 +53054,255 @@ index 90860d224cff..2e6f3c2b7f72 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("link_capacity_estimator_gn")
+diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
+index aae4b8252060..0cad7d4a534c 100644
+--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
++++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
+ DEFINES["WEBRTC_ENABLE_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"
+
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- Library("link_capacity_estimator_gn")
-diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build
-index 343754d93659..9b5b530ef0eb 100644
---- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build
-+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_controller_gn/moz.build
-@@ -12,10 +12,19 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 5728e0c4b27d..da1bee07288c 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,20 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -43865,7 +53311,7 @@ index 343754d93659..9b5b530ef0eb 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43873,7 +53319,7 @@ index 343754d93659..9b5b530ef0eb 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -43884,7 +53330,6 @@ index 343754d93659..9b5b530ef0eb 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -43913,13 +53358,13 @@ index 343754d93659..9b5b530ef0eb 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -43978,6 +53423,24 @@ index 343754d93659..9b5b530ef0eb 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -44010,8 +53473,7 @@ index 343754d93659..9b5b530ef0eb 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -44029,34 +53491,40 @@ index 343754d93659..9b5b530ef0eb 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("loss_based_controller_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("loss_based_bwe_v2_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index 6ee25f7b9dae..620dabfd9f22 100644
+index 4f4f573cd902..51646a517e70 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -44065,7 +53533,7 @@ index 6ee25f7b9dae..620dabfd9f22 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44073,7 +53541,7 @@ index 6ee25f7b9dae..620dabfd9f22 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -44084,7 +53552,6 @@ index 6ee25f7b9dae..620dabfd9f22 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -44112,14 +53579,10 @@ index 6ee25f7b9dae..620dabfd9f22 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -44156,9 +53619,6 @@ index 6ee25f7b9dae..620dabfd9f22 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -44178,6 +53638,24 @@ index 6ee25f7b9dae..620dabfd9f22 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -44210,8 +53688,7 @@ index 6ee25f7b9dae..620dabfd9f22 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -44229,34 +53706,40 @@ index 6ee25f7b9dae..620dabfd9f22 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("probe_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index b741f49e9134..6347ad262130 100644
+index e189363d3ea8..5cf159041ae8 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -44265,7 +53748,7 @@ index b741f49e9134..6347ad262130 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44273,7 +53756,7 @@ index b741f49e9134..6347ad262130 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -44314,6 +53797,7 @@ index b741f49e9134..6347ad262130 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -44369,6 +53853,24 @@ index b741f49e9134..6347ad262130 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -44402,10 +53904,10 @@ index b741f49e9134..6347ad262130 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -44419,35 +53921,40 @@ index b741f49e9134..6347ad262130 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("pushback_controller_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 95460fd8514b..b74b356b6c08 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ 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 c93e412e836f..0b6eb6ed39e9 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,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -44456,7 +53963,7 @@ index 95460fd8514b..b74b356b6c08 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44464,7 +53971,7 @@ index 95460fd8514b..b74b356b6c08 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -44475,7 +53982,6 @@ index 95460fd8514b..b74b356b6c08 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -44504,13 +54010,13 @@ index 95460fd8514b..b74b356b6c08 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -44569,6 +54075,24 @@ index 95460fd8514b..b74b356b6c08 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -44601,8 +54125,7 @@ index 95460fd8514b..b74b356b6c08 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -44620,34 +54143,40 @@ index 95460fd8514b..b74b356b6c08 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 691dd4a4489a..2cc796f64edd 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 6ee156d2f828..313ac07d0c15 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -44656,7 +54185,7 @@ index 691dd4a4489a..2cc796f64edd 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44664,7 +54193,7 @@ index 691dd4a4489a..2cc796f64edd 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -44675,7 +54204,6 @@ index 691dd4a4489a..2cc796f64edd 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -44704,13 +54232,13 @@ index 691dd4a4489a..2cc796f64edd 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -44769,6 +54297,24 @@ index 691dd4a4489a..2cc796f64edd 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -44801,8 +54347,7 @@ index 691dd4a4489a..2cc796f64edd 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -44820,34 +54365,40 @@ index 691dd4a4489a..2cc796f64edd 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("transport_feedback_gn")
-diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-index 398a0250cf27..9ce55320c109 100644
---- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 eb5a2a87e058..b4e083731eed 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -44856,17 +54407,30 @@ index 398a0250cf27..9ce55320c109 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,106 +49,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
--if CONFIG["OS_TARGET"] == "Darwin":
+-if CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
+- 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_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
- ]
-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
@@ -44884,19 +54448,19 @@ index 398a0250cf27..9ce55320c109 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
-- CXXFLAGS += [
-- "-msse2"
+- 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_POSIX"] = True
@@ -44932,14 +54496,59 @@ index 398a0250cf27..9ce55320c109 100644
- 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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
@@ -44952,36 +54561,208 @@ index 398a0250cf27..9ce55320c109 100644
-
- 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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("transport_feedback_gn")
+diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
+index 06e178901e14..8c38587543bd 100644
+--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
++++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
+@@ -12,12 +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"
+
+@@ -44,110 +53,23 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
++ DEFINES["_DEBUG"] = True
+
+-if CONFIG["OS_TARGET"] == "Darwin":
+if CONFIG["CPU_ARCH"] == "x86":
CXXFLAGS += [
- "-msse2",
++ "-msse2",
"-msse2"
]
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- 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["_GNU_SOURCE"] = True
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+if CONFIG["CPU_ARCH"] == "x86_64":
CXXFLAGS += [
"-msse2"
-diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-index d5e8525ed124..93b7519e78a9 100644
---- third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-@@ -13,10 +13,20 @@ AllowCompilerWarnings()
+ ]
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_X11"] = "1"
+- DEFINES["WEBRTC_BSD"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["__STD_C"] = True
+-
+-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"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+- CXXFLAGS += [
+- "-msse2",
+- "-msse2"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
+ Library("desktop_capture_differ_sse2_gn")
+diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+index 8c56b6b8e5a4..a94fc562734c 100644
+--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
++++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+@@ -14,11 +14,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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_USE_X11"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -44990,56 +54771,7 @@ index d5e8525ed124..93b7519e78a9 100644
FINAL_LIBRARY = "webrtc"
-@@ -26,12 +36,23 @@ LOCAL_INCLUDES += [
- "/ipc/chromium/src",
- "/media/libyuv/",
- "/media/libyuv/libyuv/include/",
-+ "/media/libyuv/libyuv/include/",
- "/third_party/libwebrtc/",
- "/third_party/libwebrtc/third_party/abseil-cpp/",
-- "/third_party/pipewire/",
- "/tools/profiler/public"
- ]
-
-+OS_LIBS += [
-+ "X11",
-+ "Xcomposite",
-+ "Xdamage",
-+ "Xext",
-+ "Xfixes",
-+ "Xrandr",
-+ "Xrender",
-+ "Xtst"
-+]
-+
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc",
- "/third_party/libwebrtc/modules/desktop_capture/capture_result_desktop_capturer_wrapper.cc",
-@@ -49,10 +70,23 @@ UNIFIED_SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc",
- "/third_party/libwebrtc/modules/desktop_capture/full_screen_application_handler.cc",
- "/third_party/libwebrtc/modules/desktop_capture/full_screen_window_detector.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc",
- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/resolution_tracker.cc",
- "/third_party/libwebrtc/modules/desktop_capture/rgba_color.cc",
- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_helper.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_finder.cc"
- ]
-
-@@ -65,181 +99,19 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -70,554 +79,39 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45075,12 +54807,14 @@ index d5e8525ed124..93b7519e78a9 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc"
+- ]
+-
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc"
- ]
@@ -45088,10 +54822,10 @@ index d5e8525ed124..93b7519e78a9 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["WEBRTC_USE_X11"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
@@ -45111,23 +54845,20 @@ index d5e8525ed124..93b7519e78a9 100644
- ]
-
- SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc"
+- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc"
- ]
-
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc",
- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc"
- ]
@@ -45179,6 +54910,7 @@ index d5e8525ed124..93b7519e78a9 100644
- "/third_party/libwebrtc/modules/desktop_capture/win/cursor.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/d3d_device.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/desktop.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/win/desktop_capture_utils.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/display_configuration_monitor.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/dxgi_context.cc",
@@ -45196,7 +54928,6 @@ index d5e8525ed124..93b7519e78a9 100644
- "/third_party/libwebrtc/modules/desktop_capture/win/selected_window_context.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/window_capture_utils.cc",
- "/third_party/libwebrtc/modules/desktop_capture/win/window_capturer_win_gdi.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/win/window_capturer_win_wgc.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_win.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_finder_win.cc"
- ]
@@ -45206,30 +54937,105 @@ index d5e8525ed124..93b7519e78a9 100644
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
-+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-if CONFIG["CPU_ARCH"] == "arm":
-
- CXXFLAGS += [
- "-mfpu=neon"
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/",
-+ "/third_party/pipewire/"
- ]
-
+- ]
+-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc"
- ]
-@@ -251,71 +123,22 @@ if CONFIG["CPU_ARCH"] == "arm":
-
- if CONFIG["CPU_ARCH"] == "ppc64":
+- LOCAL_INCLUDES += [
+- "/gfx/angle/checkout/include/",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/gbm/gbm/",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/pipewire/"
+- ]
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+- ]
+-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+- ]
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+- LOCAL_INCLUDES += [
+- "/gfx/angle/checkout/include/",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/gbm/gbm/",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/pipewire/"
+- ]
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+- ]
+-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+- LOCAL_INCLUDES += [
+- "/gfx/angle/checkout/include/",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/gbm/gbm/",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/pipewire/"
+- ]
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+- ]
+-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "ppc64":
+-
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_USE_X11"] = True
-
@@ -45245,18 +55051,55 @@ index d5e8525ed124..93b7519e78a9 100644
- ]
-
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc"
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
- ]
-
+-if CONFIG["CPU_ARCH"] == "riscv64":
+-
+- DEFINES["USE_X11"] = "1"
+- DEFINES["WEBRTC_USE_X11"] = True
+-
+- OS_LIBS += [
+- "X11",
+- "Xcomposite",
+- "Xdamage",
+- "Xext",
+- "Xfixes",
+- "Xrandr",
+- "Xrender",
+- "Xtst"
+- ]
+-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
+- ]
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
@@ -45278,55 +55121,92 @@ index d5e8525ed124..93b7519e78a9 100644
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
+- LOCAL_INCLUDES += [
+- "/gfx/angle/checkout/include/",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/gbm/gbm/",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/pipewire/"
+- ]
+-
- SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc"
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/"
- ]
-
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+- ]
+-
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-+
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/",
-+ "/third_party/pipewire/"
-+ ]
-
- SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc"
-@@ -326,10 +149,14 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
- ]
-
+-
+- LOCAL_INCLUDES += [
+- "/gfx/angle/checkout/include/",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/gbm/gbm/",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/pipewire/"
+- ]
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+- ]
+-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+- ]
+-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86_64":
-
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-
+- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-+
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/",
-+ "/third_party/pipewire/"
-+ ]
-
- SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc"
-@@ -340,120 +167,4 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
- ]
-
+-
+- LOCAL_INCLUDES += [
+- "/gfx/angle/checkout/include/",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/gbm/gbm/",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/pipewire/"
+- ]
+-
+- SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+- ]
+-
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+- ]
+-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_X11"] = "1"
@@ -45344,16 +55224,16 @@ index d5e8525ed124..93b7519e78a9 100644
- ]
-
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc"
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
- ]
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
@@ -45373,19 +55253,19 @@ index d5e8525ed124..93b7519e78a9 100644
- ]
-
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc"
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
- ]
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_USE_X11"] = True
@@ -45400,18 +55280,76 @@ index d5e8525ed124..93b7519e78a9 100644
- "Xrender",
- "Xtst"
- ]
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- DEFINES["USE_X11"] = "1"
+- DEFINES["WEBRTC_USE_X11"] = True
-
+- OS_LIBS += [
+- "X11",
+- "Xcomposite",
+- "Xdamage",
+- "Xext",
+- "Xfixes",
+- "Xrandr",
+- "Xrender",
+- "Xtst"
+- ]
++if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc",
++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_null.cc",
++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_null.cc"
+ ]
+
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+ DEFINES["WEBRTC_USE_X11"] = True
+@@ -633,33 +127,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGE
+ "Xtst"
+ ]
+
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc"
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
@@ -45428,39 +55366,122 @@ index d5e8525ed124..93b7519e78a9 100644
- "Xrandr",
- "Xrender",
- "Xtst"
-- ]
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/screen_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/shared_x_display.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_finder_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/window_list_utils.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_atom_cache.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_error_trap.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x_window_property.cc"
-- ]
--
- Library("desktop_capture_generic_gn")
-diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-index e281ba8daf2a..bdc8143dc058 100644
---- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-@@ -11,10 +11,20 @@ AllowCompilerWarnings()
++ SOURCES += [
++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc"
+ ]
+
+ UNIFIED_SOURCES += [
+@@ -672,7 +141,9 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TA
+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
++ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc",
++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc",
++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc"
+ ]
+ Library("desktop_capture_gn")
+diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
+deleted file mode 100644
+index 2706bed4a65f..000000000000
+--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
++++ /dev/null
+@@ -1,77 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CMMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/sdk/objc/",
+- "/third_party/libwebrtc/sdk/objc/base/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_configuration.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_cgimage.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_iosurface.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_provider.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_mac.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_darwin.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_mac.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/window_finder_mac.mm"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("desktop_capture_objc_gn")
+diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
+index 59c2ba037b83..4458ad4e5673 100644
+--- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
++++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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_USE_X11"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -45469,25 +55490,7 @@ index e281ba8daf2a..bdc8143dc058 100644
FINAL_LIBRARY = "webrtc"
-@@ -27,6 +37,17 @@ LOCAL_INCLUDES += [
- "/tools/profiler/public"
- ]
-
-+OS_LIBS += [
-+ "X11",
-+ "Xcomposite",
-+ "Xdamage",
-+ "Xext",
-+ "Xfixes",
-+ "Xrandr",
-+ "Xrender",
-+ "Xtst"
-+]
-+
- if not CONFIG["MOZ_DEBUG"]:
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -36,213 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,165 +58,31 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45516,35 +55519,19 @@ index e281ba8daf2a..bdc8143dc058 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_X11"] = 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 += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
--
-if CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@@ -45570,15 +55557,6 @@ index e281ba8daf2a..bdc8143dc058 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "crypt32",
-- "d3d11",
-- "dxgi",
-- "iphlpapi",
-- "secur32",
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -45588,26 +55566,40 @@ index e281ba8daf2a..bdc8143dc058 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
- DEFINES["_GNU_SOURCE"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["CPU_ARCH"] == "ppc64":
-
- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_USE_X11"] = True
-
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
+-if CONFIG["CPU_ARCH"] == "riscv64":
+-
+- DEFINES["USE_X11"] = "1"
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
@@ -45631,6 +55623,10 @@ index e281ba8daf2a..bdc8143dc058 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
@@ -45640,84 +55636,48 @@ index e281ba8daf2a..bdc8143dc058 100644
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_USE_X11"] = True
--
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_USE_X11"] = True
-
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_USE_X11"] = True
-
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
--
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_USE_X11"] = True
--
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
--
- Library("desktop_capture_gn")
-diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-index 27fd94b5b85c..600c61f02ec3 100644
---- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-+++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["USE_X11"] = "1"
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
+index 3b999fdfdfe9..b5cd5bd51eb9 100644
+--- third_party/libwebrtc/modules/module_api_gn/moz.build
++++ third_party/libwebrtc/modules/module_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -45726,11 +55686,24 @@ index 27fd94b5b85c..600c61f02ec3 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,135 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_MAC"] = True
@@ -45758,6 +55731,7 @@ index 27fd94b5b85c..600c61f02ec3 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -45801,18 +55775,29 @@ index 27fd94b5b85c..600c61f02ec3 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
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+-if CONFIG["CPU_ARCH"] == "mips64":
-
-- DEFINES["USE_X11"] = "1"
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
@@ -45830,56 +55815,58 @@ index 27fd94b5b85c..600c61f02ec3 100644
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- CXXFLAGS += [
- "-msse2"
- ]
+ DEFINES["USE_X11"] = "1"
-- DEFINES["_GNU_SOURCE"] = True
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "android_support",
+- "unwind"
+- ]
-
-- DEFINES["_GNU_SOURCE"] = True
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "android_support"
+- ]
-
-- DEFINES["USE_X11"] = "1"
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+- DEFINES["_GNU_SOURCE"] = True
-
-- DEFINES["USE_X11"] = "1"
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+- DEFINES["_GNU_SOURCE"] = True
-
-- DEFINES["USE_X11"] = "1"
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+- DEFINES["_GNU_SOURCE"] = True
-
-- DEFINES["USE_X11"] = "1"
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- Library("primitives_gn")
-diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index 6ec677faa02d..f0e31a18277d 100644
---- third_party/libwebrtc/modules/module_api_gn/moz.build
-+++ third_party/libwebrtc/modules/module_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ Library("module_api_gn")
+diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
+index 6d3952410c70..6d2484302b75 100644
+--- third_party/libwebrtc/modules/module_api_public_gn/moz.build
++++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -45888,7 +55875,7 @@ index 6ec677faa02d..f0e31a18277d 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45896,7 +55883,7 @@ index 6ec677faa02d..f0e31a18277d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -45933,6 +55920,7 @@ index 6ec677faa02d..f0e31a18277d 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -45980,6 +55968,22 @@ index 6ec677faa02d..f0e31a18277d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -46001,9 +56005,10 @@ index 6ec677faa02d..f0e31a18277d 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 += [
@@ -46033,23 +56038,24 @@ index 6ec677faa02d..f0e31a18277d 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("module_api_gn")
-diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index 5eb4229dd18c..deb99a1aeaf7 100644
---- third_party/libwebrtc/modules/module_api_public_gn/moz.build
-+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("module_api_public_gn")
+diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
+index 3badc9ded12e..b50fec7f7d98 100644
+--- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
++++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -46058,7 +56064,7 @@ index 5eb4229dd18c..deb99a1aeaf7 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46066,7 +56072,7 @@ index 5eb4229dd18c..deb99a1aeaf7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -46103,6 +56109,7 @@ index 5eb4229dd18c..deb99a1aeaf7 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -46150,6 +56157,22 @@ index 5eb4229dd18c..deb99a1aeaf7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -46171,9 +56194,10 @@ index 5eb4229dd18c..deb99a1aeaf7 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 += [
@@ -46203,23 +56227,24 @@ index 5eb4229dd18c..deb99a1aeaf7 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("module_api_public_gn")
-diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index 0a1dad5b877b..9b9e77c3ee61 100644
---- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("module_fec_api_gn")
+diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
+index 17d4371d72e0..f42d208ca469 100644
+--- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
++++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -46228,7 +56253,7 @@ index 0a1dad5b877b..9b9e77c3ee61 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46236,7 +56261,7 @@ index 0a1dad5b877b..9b9e77c3ee61 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -46246,6 +56271,10 @@ index 0a1dad5b877b..9b9e77c3ee61 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -46273,6 +56302,7 @@ index 0a1dad5b877b..9b9e77c3ee61 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -46316,10 +56346,32 @@ index 0a1dad5b877b..9b9e77c3ee61 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -46353,6 +56405,10 @@ index 0a1dad5b877b..9b9e77c3ee61 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -46366,30 +56422,40 @@ index 0a1dad5b877b..9b9e77c3ee61 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("module_fec_api_gn")
-diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index b38038c227df..016c62e81d53 100644
---- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ 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 61ece82430a2..5605df303cd7 100644
+--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
++++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -46398,7 +56464,7 @@ index b38038c227df..016c62e81d53 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46406,7 +56472,7 @@ index b38038c227df..016c62e81d53 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -46444,9 +56510,14 @@ index b38038c227df..016c62e81d53 100644
- 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_POSIX"] = True
@@ -46483,6 +56554,9 @@ index b38038c227df..016c62e81d53 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -46502,6 +56576,24 @@ index b38038c227df..016c62e81d53 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -46535,10 +56627,10 @@ index b38038c227df..016c62e81d53 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -46552,35 +56644,155 @@ index b38038c227df..016c62e81d53 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 77f554bcaa93..b0b0e8162df2 100644
---- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ Library("pacing_gn")
+diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build
+deleted file mode 100644
+index 77603c780bdc..000000000000
+--- third_party/libwebrtc/modules/portal/portal_gn/moz.build
++++ /dev/null
+@@ -1,109 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+- CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["USE_AURA"] = "1"
+-DEFINES["USE_GLIB"] = "1"
+-DEFINES["USE_NSS_CERTS"] = "1"
+-DEFINES["USE_OZONE"] = "1"
+-DEFINES["USE_UDEV"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-DEFINES["_FILE_OFFSET_BITS"] = "64"
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["_LARGEFILE64_SOURCE"] = True
+-DEFINES["_LARGEFILE_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/gfx/angle/checkout/include/",
+- "/ipc/chromium/src",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/gbm/gbm/",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/third_party/pipewire/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/portal/pipewire_utils.cc",
+- "/third_party/libwebrtc/modules/portal/scoped_glib.cc",
+- "/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["MIPS32_LE"] = True
+- DEFINES["MIPS_FPU_LE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-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 e572e90c311a..712c9fe0bacd 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,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -46589,7 +56801,7 @@ index 77f554bcaa93..b0b0e8162df2 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46597,7 +56809,7 @@ index 77f554bcaa93..b0b0e8162df2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -46608,7 +56820,6 @@ index 77f554bcaa93..b0b0e8162df2 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -46637,13 +56848,13 @@ index 77f554bcaa93..b0b0e8162df2 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -46702,6 +56913,24 @@ index 77f554bcaa93..b0b0e8162df2 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -46734,8 +56963,7 @@ index 77f554bcaa93..b0b0e8162df2 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -46753,34 +56981,40 @@ index 77f554bcaa93..b0b0e8162df2 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("pacing_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 7ad9daf4dc2c..84650cb40532 100644
---- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-+++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-@@ -12,10 +12,19 @@ AllowCompilerWarnings()
++ 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 f03986e482da..8cfbc6b1ddb3 100644
+--- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
++++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
+@@ -12,11 +12,20 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -46789,7 +57023,7 @@ index 7ad9daf4dc2c..84650cb40532 100644
FINAL_LIBRARY = "webrtc"
-@@ -51,173 +60,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46797,7 +57031,7 @@ index 7ad9daf4dc2c..84650cb40532 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -46807,11 +57041,6 @@ index 7ad9daf4dc2c..84650cb40532 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "GLESv2",
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -46836,14 +57065,10 @@ index 7ad9daf4dc2c..84650cb40532 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -46878,13 +57103,6 @@ index 7ad9daf4dc2c..84650cb40532 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":
@@ -46902,6 +57120,24 @@ index 7ad9daf4dc2c..84650cb40532 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -46934,8 +57170,7 @@ index 7ad9daf4dc2c..84650cb40532 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -46953,34 +57188,40 @@ index 7ad9daf4dc2c..84650cb40532 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("remote_bitrate_estimator_gn")
++ 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 59dfc51872bf..5d028cb933e8 100644
+index da69b456d323..3a86740343d2 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -46989,7 +57230,7 @@ index 59dfc51872bf..5d028cb933e8 100644
FINAL_LIBRARY = "webrtc"
-@@ -81,173 +90,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -85,190 +94,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46997,7 +57238,7 @@ index 59dfc51872bf..5d028cb933e8 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -47008,7 +57249,6 @@ index 59dfc51872bf..5d028cb933e8 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -47037,13 +57277,13 @@ index 59dfc51872bf..5d028cb933e8 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -47102,6 +57342,24 @@ index 59dfc51872bf..5d028cb933e8 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -47134,8 +57392,7 @@ index 59dfc51872bf..5d028cb933e8 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -47153,34 +57410,40 @@ index 59dfc51872bf..5d028cb933e8 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtp_rtcp_format_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index 0448d75c65be..6b3ece14f2af 100644
+index 5683b643c091..4ca036ae5563 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-@@ -12,10 +12,19 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -47189,7 +57452,7 @@ index 0448d75c65be..6b3ece14f2af 100644
FINAL_LIBRARY = "webrtc"
-@@ -93,173 +102,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -95,190 +104,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47197,7 +57460,7 @@ index 0448d75c65be..6b3ece14f2af 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -47208,7 +57471,6 @@ index 0448d75c65be..6b3ece14f2af 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -47237,13 +57499,13 @@ index 0448d75c65be..6b3ece14f2af 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -47302,6 +57564,24 @@ index 0448d75c65be..6b3ece14f2af 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -47334,8 +57614,7 @@ index 0448d75c65be..6b3ece14f2af 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -47353,34 +57632,40 @@ index 0448d75c65be..6b3ece14f2af 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtp_rtcp_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index 99b466e4f96f..8b28970b3a85 100644
+index 99447dd14992..4743dce9a666 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -47389,7 +57674,7 @@ index 99b466e4f96f..8b28970b3a85 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47397,7 +57682,7 @@ index 99b466e4f96f..8b28970b3a85 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -47438,6 +57723,7 @@ index 99b466e4f96f..8b28970b3a85 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -47493,6 +57779,24 @@ index 99b466e4f96f..8b28970b3a85 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -47526,10 +57830,10 @@ index 99b466e4f96f..8b28970b3a85 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -47543,35 +57847,40 @@ index 99b466e4f96f..8b28970b3a85 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtp_video_header_gn")
diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index bd5ba8d068b6..d100ead983ab 100644
+index 40022820400d..a8dff360398f 100644
--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -47580,7 +57889,7 @@ index bd5ba8d068b6..d100ead983ab 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47588,7 +57897,7 @@ index bd5ba8d068b6..d100ead983ab 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -47625,6 +57934,7 @@ index bd5ba8d068b6..d100ead983ab 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -47676,6 +57986,24 @@ index bd5ba8d068b6..d100ead983ab 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -47709,10 +58037,10 @@ index bd5ba8d068b6..d100ead983ab 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -47726,35 +58054,40 @@ index bd5ba8d068b6..d100ead983ab 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CFLAGS += [
- "-msse2"
- ]
+- CFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("fft_gn")
diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index 3090f6672642..d163dfcfe2ab 100644
+index 3b2ee5ee3d97..af84f0dd5f5a 100644
--- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -47763,7 +58096,7 @@ index 3090f6672642..d163dfcfe2ab 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47771,7 +58104,7 @@ index 3090f6672642..d163dfcfe2ab 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -47808,6 +58141,7 @@ index 3090f6672642..d163dfcfe2ab 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -47859,6 +58193,24 @@ index 3090f6672642..d163dfcfe2ab 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -47892,10 +58244,10 @@ index 3090f6672642..d163dfcfe2ab 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -47909,35 +58261,40 @@ index 3090f6672642..d163dfcfe2ab 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CFLAGS += [
- "-msse2"
- ]
+- CFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("g711_3p_gn")
diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index 786091938c38..cb3415af0578 100644
+index f40abbac1407..d320b4ef86f8 100644
--- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -47946,7 +58303,7 @@ index 786091938c38..cb3415af0578 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,156 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,175 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47954,7 +58311,7 @@ index 786091938c38..cb3415af0578 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -47991,6 +58348,7 @@ index 786091938c38..cb3415af0578 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -48042,6 +58400,24 @@ index 786091938c38..cb3415af0578 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -48075,10 +58451,10 @@ index 786091938c38..cb3415af0578 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CFLAGS += [
-- "-msse2"
-- ]
--
+ CFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -48092,35 +58468,40 @@ index 786091938c38..cb3415af0578 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CFLAGS += [
- "-msse2"
- ]
+- CFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("g722_3p_gn")
diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index 575c3b3ac226..e6a5515c0ffc 100644
+index b932f5da73da..49d074bc4db2 100644
--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -48129,7 +58510,7 @@ index 575c3b3ac226..e6a5515c0ffc 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,176 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48137,7 +58518,7 @@ index 575c3b3ac226..e6a5515c0ffc 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -48152,8 +58533,7 @@ index 575c3b3ac226..e6a5515c0ffc 100644
- ]
-
- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/utility/source/helpers_android.cc",
-- "/third_party/libwebrtc/modules/utility/source/jvm_android.cc"
+- "/third_party/libwebrtc/modules/utility/source/helpers_android.cc"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
@@ -48180,13 +58560,10 @@ index 575c3b3ac226..e6a5515c0ffc 100644
- 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_POSIX"] = True
@@ -48223,9 +58600,6 @@ index 575c3b3ac226..e6a5515c0ffc 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -48245,6 +58619,24 @@ index 575c3b3ac226..e6a5515c0ffc 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -48278,10 +58670,10 @@ index 575c3b3ac226..e6a5515c0ffc 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -48295,35 +58687,40 @@ index 575c3b3ac226..e6a5515c0ffc 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
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 645c2d7c0273..2fd65278b4df 100644
+index cd5557b826da..a481fb0e5df1 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -48332,19 +58729,21 @@ index 645c2d7c0273..2fd65278b4df 100644
FINAL_LIBRARY = "webrtc"
-@@ -27,6 +36,11 @@ LOCAL_INCLUDES += [
+@@ -30,6 +39,13 @@ LOCAL_INCLUDES += [
"/tools/profiler/public"
]
+UNIFIED_SOURCES += [
+ "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
-+ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc"
++ "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
++ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
++ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
+]
+
if not CONFIG["MOZ_DEBUG"]:
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -36,194 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,216 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48352,7 +58751,7 @@ index 645c2d7c0273..2fd65278b4df 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -48392,18 +58791,20 @@ index 645c2d7c0273..2fd65278b4df 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
-- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc"
+- "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
+- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
+- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -48415,7 +58816,9 @@ index 645c2d7c0273..2fd65278b4df 100644
-
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
-- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc"
+- "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
+- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
+- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
- ]
-
-if CONFIG["OS_TARGET"] == "WINNT":
@@ -48478,6 +58881,28 @@ index 645c2d7c0273..2fd65278b4df 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
++ CXXFLAGS += [
++ "-msse2"
++ ]
++
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -48499,9 +58924,10 @@ index 645c2d7c0273..2fd65278b4df 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 += [
@@ -48528,12 +58954,11 @@ index 645c2d7c0273..2fd65278b4df 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
@@ -48542,21 +58967,22 @@ index 645c2d7c0273..2fd65278b4df 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 1322791ebee7..8875e88c3b58 100644
+index 8aa245b127c1..1f157fe113a0 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -48565,7 +58991,7 @@ index 1322791ebee7..8875e88c3b58 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,173 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,191 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48573,7 +58999,7 @@ index 1322791ebee7..8875e88c3b58 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -48613,13 +59039,13 @@ index 1322791ebee7..8875e88c3b58 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -48678,6 +59104,24 @@ index 1322791ebee7..8875e88c3b58 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -48710,8 +59154,7 @@ index 1322791ebee7..8875e88c3b58 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -48729,34 +59172,40 @@ index 1322791ebee7..8875e88c3b58 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("video_capture_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index 2f3f10ecfec9..52da1dec4b94 100644
+index 9020f11067fc..fcc8a73423ab 100644
--- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -48765,7 +59214,7 @@ index 2f3f10ecfec9..52da1dec4b94 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48773,7 +59222,7 @@ index 2f3f10ecfec9..52da1dec4b94 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -48814,6 +59263,7 @@ index 2f3f10ecfec9..52da1dec4b94 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -48869,6 +59319,24 @@ index 2f3f10ecfec9..52da1dec4b94 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -48902,10 +59370,10 @@ index 2f3f10ecfec9..52da1dec4b94 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -48919,35 +59387,40 @@ index 2f3f10ecfec9..52da1dec4b94 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("chain_diff_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index a509d7ca5d3a..cc82b257a89a 100644
+index 7c87e340afde..b4f0490937ff 100644
--- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -48956,7 +59429,7 @@ index a509d7ca5d3a..cc82b257a89a 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48964,7 +59437,7 @@ index a509d7ca5d3a..cc82b257a89a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -49005,6 +59478,7 @@ index a509d7ca5d3a..cc82b257a89a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -49052,6 +59526,22 @@ index a509d7ca5d3a..cc82b257a89a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -49073,9 +59563,10 @@ index a509d7ca5d3a..cc82b257a89a 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 += [
@@ -49106,22 +59597,23 @@ index a509d7ca5d3a..cc82b257a89a 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("codec_globals_headers_gn")
-diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
-index 7c6bba5360ea..d86571445dc1 100644
---- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
+index cc297017e3d5..12901738a75f 100644
+--- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -49130,7 +59622,7 @@ index 7c6bba5360ea..d86571445dc1 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49138,7 +59630,7 @@ index 7c6bba5360ea..d86571445dc1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -49179,6 +59671,7 @@ index 7c6bba5360ea..d86571445dc1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -49234,6 +59727,24 @@ index 7c6bba5360ea..d86571445dc1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -49267,10 +59778,10 @@ index 7c6bba5360ea..d86571445dc1 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -49284,35 +59795,40 @@ index 7c6bba5360ea..d86571445dc1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("aom_av1_decoder_gn")
-diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-index ebba8c336f4b..9ef28453d005 100644
---- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("av1_svc_config_gn")
+diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
+index 159b77d10cab..217d265bacee 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -49321,7 +59837,7 @@ index ebba8c336f4b..9ef28453d005 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49329,7 +59845,7 @@ index ebba8c336f4b..9ef28453d005 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -49367,9 +59883,14 @@ index ebba8c336f4b..9ef28453d005 100644
- 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_POSIX"] = True
@@ -49406,6 +59927,9 @@ index ebba8c336f4b..9ef28453d005 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -49425,6 +59949,24 @@ index ebba8c336f4b..9ef28453d005 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -49458,10 +60000,10 @@ index ebba8c336f4b..9ef28453d005 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -49475,35 +60017,255 @@ index ebba8c336f4b..9ef28453d005 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("encoded_frame_gn")
+diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
+index c518044c948a..74af6c5dc520 100644
+--- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("aom_av1_encoder_gn")
-diff --git third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build
-index 8ffb99dc9f9b..9fbd352cdf2a 100644
---- third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+ Library("frame_dependencies_calculator_gn")
+diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
+index d6342c48f713..544a97f60aad 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -49512,7 +60274,7 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49520,7 +60282,7 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -49565,6 +60327,7 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -49623,6 +60386,24 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -49655,8 +60436,7 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -49674,34 +60454,40 @@ index 8ffb99dc9f9b..9fbd352cdf2a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("nack_module_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 ec4c04daed07..aed6cdae0672 100644
---- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("frame_helpers_gn")
+diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
+index 33e763a48d7e..e1db6e2439d5 100644
+--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -49710,7 +60496,7 @@ index ec4c04daed07..aed6cdae0672 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49718,7 +60504,7 @@ index ec4c04daed07..aed6cdae0672 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -49729,7 +60515,6 @@ index ec4c04daed07..aed6cdae0672 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -49758,13 +60543,13 @@ index ec4c04daed07..aed6cdae0672 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -49823,6 +60608,24 @@ index ec4c04daed07..aed6cdae0672 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -49855,8 +60658,7 @@ index ec4c04daed07..aed6cdae0672 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -49874,34 +60676,40 @@ index ec4c04daed07..aed6cdae0672 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("encoded_frame_gn")
-diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index 85bfa4e12eed..264c3baa35aa 100644
---- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("nack_requester_gn")
+diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
+index 9561cb88e8eb..65e5b4757c29 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -49910,7 +60718,7 @@ index 85bfa4e12eed..264c3baa35aa 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49918,7 +60726,7 @@ index 85bfa4e12eed..264c3baa35aa 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -49956,9 +60764,14 @@ index 85bfa4e12eed..264c3baa35aa 100644
- 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_POSIX"] = True
@@ -49995,6 +60808,9 @@ index 85bfa4e12eed..264c3baa35aa 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -50014,6 +60830,24 @@ index 85bfa4e12eed..264c3baa35aa 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -50047,10 +60881,10 @@ index 85bfa4e12eed..264c3baa35aa 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -50064,35 +60898,40 @@ index 85bfa4e12eed..264c3baa35aa 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("frame_dependencies_calculator_gn")
-diff --git third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build
-index 9aaf3524fe58..d43e051ee6ca 100644
---- third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/nack_module_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("packet_buffer_gn")
+diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
+index f786b1161681..e6d655af95dc 100644
+--- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -50101,7 +60940,7 @@ index 9aaf3524fe58..d43e051ee6ca 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50109,7 +60948,7 @@ index 9aaf3524fe58..d43e051ee6ca 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -50147,13 +60986,10 @@ index 9aaf3524fe58..d43e051ee6ca 100644
- 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_POSIX"] = True
@@ -50190,9 +61026,6 @@ index 9aaf3524fe58..d43e051ee6ca 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -50212,6 +61045,24 @@ index 9aaf3524fe58..d43e051ee6ca 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -50244,8 +61095,7 @@ index 9aaf3524fe58..d43e051ee6ca 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -50263,34 +61113,40 @@ index 9aaf3524fe58..d43e051ee6ca 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("nack_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 20e0b2301bc9..b5a9b94a0a1c 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("scalability_mode_util_gn")
+diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
+index a3e45b1cd7ba..12c34079a6e6 100644
+--- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -50299,7 +61155,7 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50307,7 +61163,7 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -50318,7 +61174,6 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -50346,14 +61201,10 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -50390,9 +61241,6 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -50412,6 +61260,24 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -50444,8 +61310,7 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -50463,34 +61328,40 @@ index 20e0b2301bc9..b5a9b94a0a1c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 5d1d6b149efe..dbc070a0591d 100644
---- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("scalability_structures_gn")
+diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
+index 42b8307362fe..9348473d2af9 100644
+--- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -50499,7 +61370,7 @@ index 5d1d6b149efe..dbc070a0591d 100644
FINAL_LIBRARY = "webrtc"
-@@ -60,173 +69,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50507,7 +61378,7 @@ index 5d1d6b149efe..dbc070a0591d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -50518,7 +61389,6 @@ index 5d1d6b149efe..dbc070a0591d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -50546,14 +61416,221 @@ index 5d1d6b149efe..dbc070a0591d 100644
- 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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
- OS_LIBS += [
-- "dl",
-- "rt"
+- "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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("scalable_video_controller_gn")
+diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
+index 5d7d952a69b9..7157f0bd74ba 100644
+--- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_POSIX"] = True
@@ -50590,9 +61667,6 @@ index 5d1d6b149efe..dbc070a0591d 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -50612,6 +61686,24 @@ index 5d1d6b149efe..dbc070a0591d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -50644,8 +61736,7 @@ index 5d1d6b149efe..dbc070a0591d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -50663,34 +61754,40 @@ index 5d1d6b149efe..dbc070a0591d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 aef956f70da7..3cfd326a858f 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("svc_rate_allocator_gn")
+diff --git third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build
+index 59498feb917b..e0a3f25c615c 100644
+--- third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -50699,7 +61796,7 @@ index aef956f70da7..3cfd326a858f 100644
FINAL_LIBRARY = "webrtc"
-@@ -49,173 +58,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50707,7 +61804,7 @@ index aef956f70da7..3cfd326a858f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -50718,7 +61815,6 @@ index aef956f70da7..3cfd326a858f 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -50746,14 +61842,10 @@ index aef956f70da7..3cfd326a858f 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -50788,13 +61880,217 @@ index aef956f70da7..3cfd326a858f 100644
- 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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
+- "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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("codec_timer_gn")
+diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
+index ecdcfc93e128..47bc48987a96 100644
+--- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
@@ -50812,6 +62108,24 @@ index aef956f70da7..3cfd326a858f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -50844,8 +62158,7 @@ index aef956f70da7..3cfd326a858f 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -50863,34 +62176,251 @@ index aef956f70da7..3cfd326a858f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("frame_delay_variation_kalman_filter_gn")
+diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build
+index 765d42aade9c..2fc89d07d0c4 100644
+--- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "mips64":
-
- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
- Library("video_coding_utility_gn")
-diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-index 3eab3acb7156..23efd0636d75 100644
---- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 a0d6154d785f..b158655cdd5d 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -50899,7 +62429,7 @@ index 3eab3acb7156..23efd0636d75 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50907,7 +62437,7 @@ index 3eab3acb7156..23efd0636d75 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -50918,7 +62448,6 @@ index 3eab3acb7156..23efd0636d75 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -50947,13 +62476,13 @@ index 3eab3acb7156..23efd0636d75 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -51012,6 +62541,24 @@ index 3eab3acb7156..23efd0636d75 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -51044,8 +62591,7 @@ index 3eab3acb7156..23efd0636d75 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -51063,34 +62609,462 @@ index 3eab3acb7156..23efd0636d75 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("jitter_estimator_gn")
+diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
+index 488a49d9c26b..bc1e328ba2ec 100644
+--- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("rtt_filter_gn")
+diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
+index 4cd085dd0962..2865a2290f7d 100644
+--- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- Library("webrtc_h264_gn")
-diff --git third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
-index 087fbfe8054e..7b93387c4dff 100644
---- third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("timestamp_extrapolator_gn")
+diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
+index 8ab43fb7484d..4fd77d42f049 100644
+--- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -51099,7 +63073,7 @@ index 087fbfe8054e..7b93387c4dff 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,173 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51107,7 +63081,7 @@ index 087fbfe8054e..7b93387c4dff 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -51118,7 +63092,6 @@ index 087fbfe8054e..7b93387c4dff 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -51147,13 +63120,13 @@ index 087fbfe8054e..7b93387c4dff 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -51212,6 +63185,24 @@ index 087fbfe8054e..7b93387c4dff 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -51244,8 +63235,7 @@ index 087fbfe8054e..7b93387c4dff 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -51263,34 +63253,40 @@ index 087fbfe8054e..7b93387c4dff 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("webrtc_multiplex_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 66a15bc24254..2debf9425e57 100644
---- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("timing_module_gn")
+diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
+index f01783ebd1f3..89deb11da94a 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -51299,7 +63295,7 @@ index 66a15bc24254..2debf9425e57 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,173 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51307,7 +63303,7 @@ index 66a15bc24254..2debf9425e57 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -51318,7 +63314,6 @@ index 66a15bc24254..2debf9425e57 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -51346,14 +63341,10 @@ index 66a15bc24254..2debf9425e57 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "dl",
-- "rt"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -51390,9 +63381,6 @@ index 66a15bc24254..2debf9425e57 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -51412,6 +63400,24 @@ index 66a15bc24254..2debf9425e57 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -51444,8 +63450,7 @@ index 66a15bc24254..2debf9425e57 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -51463,34 +63468,40 @@ index 66a15bc24254..2debf9425e57 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("webrtc_vp8_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 e0af1f81e72b..6a4e2e3ada91 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ 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 a6034ad47653..0e51e76cfcea 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -51499,7 +63510,7 @@ index e0af1f81e72b..6a4e2e3ada91 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -59,191 +68,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51507,7 +63518,7 @@ index e0af1f81e72b..6a4e2e3ada91 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -51547,13 +63558,13 @@ index e0af1f81e72b..6a4e2e3ada91 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -51612,6 +63623,24 @@ index e0af1f81e72b..6a4e2e3ada91 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -51644,8 +63673,7 @@ index e0af1f81e72b..6a4e2e3ada91 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -51663,34 +63691,40 @@ index e0af1f81e72b..6a4e2e3ada91 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 9aa5e0557fbe..a5d0fc436195 100644
---- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("video_coding_gn")
+diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
+index 1de983a78646..92ff8a1d9819 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -51699,7 +63733,7 @@ index 9aa5e0557fbe..a5d0fc436195 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,190 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51707,7 +63741,7 @@ index 9aa5e0557fbe..a5d0fc436195 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -51718,7 +63752,6 @@ index 9aa5e0557fbe..a5d0fc436195 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -51747,13 +63780,13 @@ index 9aa5e0557fbe..a5d0fc436195 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -51812,6 +63845,24 @@ index 9aa5e0557fbe..a5d0fc436195 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -51844,8 +63895,7 @@ index 9aa5e0557fbe..a5d0fc436195 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -51863,34 +63913,251 @@ index 9aa5e0557fbe..a5d0fc436195 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("video_coding_utility_gn")
+diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
+index 03437c5d57de..2adbff018445 100644
+--- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- 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 7f52a73077f0..0083baaf9559 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
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("webrtc_libvpx_interface_gn")
+diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
+index db366355de5e..8988f6d4b0ac 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -51899,7 +64166,7 @@ index 7f52a73077f0..0083baaf9559 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51907,7 +64174,7 @@ index 7f52a73077f0..0083baaf9559 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -51918,7 +64185,6 @@ index 7f52a73077f0..0083baaf9559 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -51947,13 +64213,13 @@ index 7f52a73077f0..0083baaf9559 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -52012,6 +64278,24 @@ index 7f52a73077f0..0083baaf9559 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -52044,8 +64328,7 @@ index 7f52a73077f0..0083baaf9559 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -52063,34 +64346,40 @@ index 7f52a73077f0..0083baaf9559 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("webrtc_vp9_helpers_gn")
-diff --git third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
-index bd1b5a54b70a..daa6a926e78e 100644
---- third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
-+++ third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("webrtc_vp8_gn")
+diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
+index 3d5642df008a..3efc79029a22 100644
+--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
++++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -52099,7 +64388,7 @@ index bd1b5a54b70a..daa6a926e78e 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52107,7 +64396,7 @@ index bd1b5a54b70a..daa6a926e78e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -52117,6 +64406,10 @@ index bd1b5a54b70a..daa6a926e78e 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -52144,6 +64437,7 @@ index bd1b5a54b70a..daa6a926e78e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -52187,10 +64481,32 @@ index bd1b5a54b70a..daa6a926e78e 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -52224,6 +64540,10 @@ index bd1b5a54b70a..daa6a926e78e 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -52237,30 +64557,40 @@ index bd1b5a54b70a..daa6a926e78e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("denoiser_filter_gn")
-diff --git third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
-index 439ca091a399..0cd8182ca1ed 100644
---- third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
-+++ third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("webrtc_vp8_scalability_gn")
+diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
+index db3848fb5759..64f1526a2eb2 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -52269,7 +64599,7 @@ index 439ca091a399..0cd8182ca1ed 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,173 +55,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52277,7 +64607,7 @@ index 439ca091a399..0cd8182ca1ed 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -52288,7 +64618,6 @@ index 439ca091a399..0cd8182ca1ed 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -52317,13 +64646,13 @@ index 439ca091a399..0cd8182ca1ed 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -52382,6 +64711,24 @@ index 439ca091a399..0cd8182ca1ed 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -52414,8 +64761,7 @@ index 439ca091a399..0cd8182ca1ed 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -52433,36 +64779,40 @@ index 439ca091a399..0cd8182ca1ed 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("video_processing_gn")
-diff --git third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
-index 873dd23bd8e8..48061d6115fa 100644
---- third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
-+++ third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
-@@ -11,11 +11,21 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("webrtc_vp8_temporal_layers_gn")
+diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
+index f470652e6d6c..03f7307e20ea 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,20 @@ 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_X11"] = "1"
-+DEFINES["WEBRTC_ARCH_ARM64"] = True
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -52471,7 +64821,7 @@ index 873dd23bd8e8..48061d6115fa 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,132 +51,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52479,7 +64829,7 @@ index 873dd23bd8e8..48061d6115fa 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -52489,9 +64839,13 @@ index 873dd23bd8e8..48061d6115fa 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "GLESv2",
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
@@ -52509,17 +64863,20 @@ index 873dd23bd8e8..48061d6115fa 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GNU_SOURCE"] = True
- 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_ARCH_ARM64"] = True
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -52536,7 +64893,6 @@ index 873dd23bd8e8..48061d6115fa 100644
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
@@ -52555,6 +64911,19 @@ index 873dd23bd8e8..48061d6115fa 100644
- 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":
-
- CXXFLAGS += [
@@ -52563,6 +64932,25 @@ index 873dd23bd8e8..48061d6115fa 100644
-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -52570,8 +64958,8 @@ index 873dd23bd8e8..48061d6115fa 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
@@ -52588,10 +64976,6 @@ index 873dd23bd8e8..48061d6115fa 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DEFINES["WEBRTC_ARCH_ARM64"] = True
--
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -52599,27 +64983,59 @@ index 873dd23bd8e8..48061d6115fa 100644
- "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_ARCH_ARM64"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- Library("video_processing_neon_gn")
-diff --git third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build
-index be3f4a1ae6c5..578fd2141719 100644
---- third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build
-+++ third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("webrtc_vp9_gn")
+diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
+index 77a0c38f9903..0390ceb82364 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -52628,7 +65044,7 @@ index be3f4a1ae6c5..578fd2141719 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,155 +49,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52636,7 +65052,7 @@ index be3f4a1ae6c5..578fd2141719 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -52647,15 +65063,12 @@ index be3f4a1ae6c5..578fd2141719 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
@@ -52673,7 +65086,6 @@ index be3f4a1ae6c5..578fd2141719 100644
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
-- DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -52685,11 +65097,8 @@ index be3f4a1ae6c5..578fd2141719 100644
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -52731,6 +65140,40 @@ index be3f4a1ae6c5..578fd2141719 100644
- "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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -52746,8 +65189,8 @@ index be3f4a1ae6c5..578fd2141719 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -52756,98 +65199,89 @@ index be3f4a1ae6c5..578fd2141719 100644
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2",
-- "-msse2"
+- 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"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++if CONFIG["CPU_ARCH"] == "x86_64":
- CXXFLAGS += [
- "-msse2",
- "-msse2"
- ]
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86_64":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- CXXFLAGS += [
- "-msse2"
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("webrtc_vp9_helpers_gn")
diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index 8579f8bb3622..b01f3fe7092d 100644
+index 0920c2883cec..7579b40c86b7 100644
--- third_party/libwebrtc/moz.build
+++ third_party/libwebrtc/moz.build
-@@ -25,7 +25,9 @@ DIRS += [
- "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn",
- "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn",
- "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn",
-+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn",
-+ "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn",
- "/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn",
- "/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn",
-@@ -157,7 +159,9 @@ DIRS += [
- "/third_party/libwebrtc/modules/audio_coding/ilbc_c_gn",
- "/third_party/libwebrtc/modules/audio_coding/ilbc_gn",
- "/third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn",
-+ "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
- "/third_party/libwebrtc/modules/audio_coding/isac_common_gn",
-+ "/third_party/libwebrtc/modules/audio_coding/isac_gn",
- "/third_party/libwebrtc/modules/audio_coding/isac_vad_gn",
- "/third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn",
- "/third_party/libwebrtc/modules/audio_coding/neteq_gn",
-@@ -233,6 +237,9 @@ DIRS += [
- "/third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn",
+@@ -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",
-+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/module_api_gn",
"/third_party/libwebrtc/modules/module_api_public_gn",
"/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -368,214 +375,7 @@ DIRS += [
+@@ -456,86 +458,14 @@ DIRS += [
"/third_party/libwebrtc/webrtc_gn"
]
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DIRS += [
+- "/third_party/libwebrtc/rtc_base/ifaddrs_android_gn"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
- "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn",
+- "/third_party/libwebrtc/rtc_base/system/gcd_helpers_gn",
- "/third_party/libwebrtc/sdk/base_objc_gn",
-- "/third_party/libwebrtc/sdk/helpers_objc_gn"
+- "/third_party/libwebrtc/sdk/helpers_objc_gn",
+- "/third_party/libwebrtc/sdk/videocapture_objc_gn",
+- "/third_party/libwebrtc/sdk/videoframebuffer_objc_gn"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
- ]
@@ -52855,170 +65289,157 @@ index 8579f8bb3622..b01f3fe7092d 100644
-if CONFIG["OS_TARGET"] == "WINNT":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
+- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
+- "/third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn",
+- "/third_party/libwebrtc/rtc_base/win/get_activation_factory_gn",
+- "/third_party/libwebrtc/rtc_base/win/hstring_gn",
+- "/third_party/libwebrtc/rtc_base/win/windows_version_gn",
+- "/third_party/libwebrtc/rtc_base/win32_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
--
-- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
-- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
-- "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
-- ]
--
++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DIRS += [
+ "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
+ "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
+ ]
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn",
- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
- "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn",
- "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
+- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
+- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Darwin":
-
- DIRS += [
- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
-- "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
+- "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
--
-- DIRS += [
-- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
-- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
-- ]
--
++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DIRS += [
+ "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
+@@ -545,128 +475,7 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn"
+ ]
+
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
- "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
+- "/third_party/libwebrtc/modules/portal/portal_gn",
+- "/third_party/libwebrtc/third_party/drm/drm_gn",
+- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
+- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
+- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn",
- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
- "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn",
-- "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
+- "/third_party/libwebrtc/modules/portal/portal_gn",
+- "/third_party/libwebrtc/rtc_base/system/asm_defines_gn",
+- "/third_party/libwebrtc/third_party/drm/drm_gn",
+- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
+- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
+- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DIRS += [
+- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
+- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
+- "/third_party/libwebrtc/modules/portal/portal_gn",
+- "/third_party/libwebrtc/third_party/drm/drm_gn",
+- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
+- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
+- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
- ]
-
--if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["OS_TARGET"] == "Linux":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn"
+- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
+- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
+- "/third_party/libwebrtc/modules/portal/portal_gn",
+- "/third_party/libwebrtc/third_party/drm/drm_gn",
+- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
+- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
+- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
+- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
+- "/third_party/libwebrtc/modules/portal/portal_gn",
+- "/third_party/libwebrtc/third_party/drm/drm_gn",
+- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
+- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
+- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DIRS += [
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
-- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn",
- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
+- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
+- "/third_party/libwebrtc/modules/portal/portal_gn",
+- "/third_party/libwebrtc/third_party/drm/drm_gn",
+- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
+- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
+- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DIRS += [
- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
-- "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
+- "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
@@ -53027,49 +65448,256 @@ index 8579f8bb3622..b01f3fe7092d 100644
- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
-- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
+- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
+- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn"
- ]
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT":
-+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
-
- DIRS += [
- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
-@@ -583,7 +383,7 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT":
- "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
- ]
-
+-
+- DIRS += [
+- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
+- "/third_party/libwebrtc/common_audio/common_audio_neon_gn"
+- ]
+-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
-+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
+-
+- DIRS += [
+- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
+- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
+- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
+- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
+- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT":
++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD":
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -593,7 +393,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
- "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
+@@ -675,17 +484,3 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT":
+ "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn"
]
+-
+-if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DIRS += [
+- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
+- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "riscv64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DIRS += [
+- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
+- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
+- ]
+diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
+index b93fca231d69..be25257373e5 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,20 @@ 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_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
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT":
-+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD":
+ FINAL_LIBRARY = "webrtc"
- DIRS += [
- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-diff --git third_party/libwebrtc/rtc_base/atomicops_gn/moz.build third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
-index 963c9d8d4e47..72a045e0479f 100644
---- third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("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 8e1b4e454d4d..ee64165c31d3 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -53078,7 +65706,7 @@ index 963c9d8d4e47..72a045e0479f 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53086,7 +65714,7 @@ index 963c9d8d4e47..72a045e0479f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -53096,6 +65724,11 @@ index 963c9d8d4e47..72a045e0479f 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "GLESv2",
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -53123,6 +65756,7 @@ index 963c9d8d4e47..72a045e0479f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -53157,6 +65791,13 @@ index 963c9d8d4e47..72a045e0479f 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":
@@ -53166,10 +65807,32 @@ index 963c9d8d4e47..72a045e0479f 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -53203,6 +65866,10 @@ index 963c9d8d4e47..72a045e0479f 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -53216,30 +65883,40 @@ index 963c9d8d4e47..72a045e0479f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("atomicops_gn")
++ DEFINES["USE_X11"] = "1"
+
+ 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 741fb67c65ed..6b0f4f96b926 100644
+index d5cc0504b1d5..41df619ecefa 100644
--- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
+++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -53248,7 +65925,7 @@ index 741fb67c65ed..6b0f4f96b926 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53256,7 +65933,7 @@ index 741fb67c65ed..6b0f4f96b926 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -53297,6 +65974,7 @@ index 741fb67c65ed..6b0f4f96b926 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -53352,6 +66030,24 @@ index 741fb67c65ed..6b0f4f96b926 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -53385,11 +66081,222 @@ index 741fb67c65ed..6b0f4f96b926 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("audio_format_to_string_gn")
+diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
+index 858cc304ba75..9d16e13e8efa 100644
+--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
++++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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"
- ]
-
@@ -53402,35 +66309,444 @@ index 741fb67c65ed..6b0f4f96b926 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("bit_buffer_gn")
+diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
+index 77059cd34301..c5dabe6ad79f 100644
+--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
++++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("bitstream_reader_gn")
+diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
+index c378c3a0b2ac..31ea8d65c7ce 100644
+--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
++++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- Library("audio_format_to_string_gn")
-diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index 985ffb8c0c5b..93a7f5c82853 100644
---- third_party/libwebrtc/rtc_base/checks_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+-if CONFIG["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("buffer_gn")
+diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
+index 43ed668b71ad..292e0dc836d1 100644
+--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
++++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -53439,7 +66755,7 @@ index 985ffb8c0c5b..93a7f5c82853 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53447,7 +66763,7 @@ index 985ffb8c0c5b..93a7f5c82853 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -53488,6 +66804,7 @@ index 985ffb8c0c5b..93a7f5c82853 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -53539,6 +66856,24 @@ index 985ffb8c0c5b..93a7f5c82853 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -53571,8 +66906,7 @@ index 985ffb8c0c5b..93a7f5c82853 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -53590,10 +66924,204 @@ index 985ffb8c0c5b..93a7f5c82853 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("byte_buffer_gn")
+diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
+index b49346b1540f..c8dbc51e612a 100644
+--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
++++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -53601,23 +67129,235 @@ index 985ffb8c0c5b..93a7f5c82853 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
+ Library("byte_order_gn")
+diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
+index 769362b62a5a..97a3da2b775a 100644
+--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
++++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- 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 95c3d974b436..4d4ec0a86468 100644
+index 5fd417eefd5a..b997040b164c 100644
--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -53626,7 +67366,7 @@ index 95c3d974b436..4d4ec0a86468 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53634,7 +67374,7 @@ index 95c3d974b436..4d4ec0a86468 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -53671,6 +67411,7 @@ index 95c3d974b436..4d4ec0a86468 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -53718,6 +67459,22 @@ index 95c3d974b436..4d4ec0a86468 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -53739,9 +67496,10 @@ index 95c3d974b436..4d4ec0a86468 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 += [
@@ -53772,22 +67530,23 @@ index 95c3d974b436..4d4ec0a86468 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("compile_assert_c_gn")
-diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index 7a36bfe59368..e0664d70169b 100644
---- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+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 2d02d778fffe..07b174d0c11e 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -53796,7 +67555,7 @@ index 7a36bfe59368..e0664d70169b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53804,7 +67563,7 @@ index 7a36bfe59368..e0664d70169b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -53845,6 +67604,7 @@ index 7a36bfe59368..e0664d70169b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -53896,6 +67656,24 @@ index 7a36bfe59368..e0664d70169b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -53928,8 +67706,7 @@ index 7a36bfe59368..e0664d70169b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -53947,10 +67724,208 @@ index 7a36bfe59368..e0664d70169b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- 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 f2d8ed054e00..df8ec55e92af 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,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -53958,23 +67933,217 @@ index 7a36bfe59368..e0664d70169b 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("criticalsection_gn")
-diff --git third_party/libwebrtc/rtc_base/deprecation_gn/moz.build third_party/libwebrtc/rtc_base/deprecation_gn/moz.build
-index 984702b66441..6651a3d4fe6a 100644
---- third_party/libwebrtc/rtc_base/deprecation_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/deprecation_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+ 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 794ed8feb87a..6d2002a94fbc 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,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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_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 eecb53c907da..bcad4a983179 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -53983,7 +68152,7 @@ index 984702b66441..6651a3d4fe6a 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53991,7 +68160,7 @@ index 984702b66441..6651a3d4fe6a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -54001,6 +68170,10 @@ index 984702b66441..6651a3d4fe6a 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -54028,6 +68201,7 @@ index 984702b66441..6651a3d4fe6a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -54071,10 +68245,32 @@ index 984702b66441..6651a3d4fe6a 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -54108,6 +68304,10 @@ index 984702b66441..6651a3d4fe6a 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -54121,30 +68321,251 @@ index 984702b66441..6651a3d4fe6a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("copy_on_write_buffer_gn")
+diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
+index c8749bb51055..95e71cdfe9cf 100644
+--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
++++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- Library("deprecation_gn")
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- 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 799abf416696..979be5da8cfa 100644
+index 8bc1e665d50d..729bb35b5b49 100644
--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -54153,7 +68574,7 @@ index 799abf416696..979be5da8cfa 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54161,7 +68582,7 @@ index 799abf416696..979be5da8cfa 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -54202,6 +68623,7 @@ index 799abf416696..979be5da8cfa 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -54249,6 +68671,22 @@ index 799abf416696..979be5da8cfa 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -54270,9 +68708,199 @@ index 799abf416696..979be5da8cfa 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("divide_round_gn")
+diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build
+index b8b28d8d0161..4050d593d1b1 100644
+--- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
++++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -54302,23 +68930,24 @@ index 799abf416696..979be5da8cfa 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("divide_round_gn")
-diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index 19fe6abc20ad..1a6b44ab8eba 100644
---- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 02fe978ab08d..c655f3b43877 100644
+--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
++++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -54327,7 +68956,7 @@ index 19fe6abc20ad..1a6b44ab8eba 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54335,7 +68964,7 @@ index 19fe6abc20ad..1a6b44ab8eba 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -54376,6 +69005,7 @@ index 19fe6abc20ad..1a6b44ab8eba 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -54431,6 +69061,24 @@ index 19fe6abc20ad..1a6b44ab8eba 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -54464,10 +69112,10 @@ index 19fe6abc20ad..1a6b44ab8eba 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -54481,35 +69129,255 @@ index 19fe6abc20ad..1a6b44ab8eba 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("event_tracer_gn")
+diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
+index 574d7d63026a..0d1253003f3d 100644
+--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
++++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
Library("alr_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index bbdb5131257c..3a8f078f6b1b 100644
+index 34b388da69ec..e1cf8913860d 100644
--- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -54518,7 +69386,7 @@ index bbdb5131257c..3a8f078f6b1b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54526,7 +69394,7 @@ index bbdb5131257c..3a8f078f6b1b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -54567,6 +69435,7 @@ index bbdb5131257c..3a8f078f6b1b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -54622,6 +69491,24 @@ index bbdb5131257c..3a8f078f6b1b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -54655,10 +69542,10 @@ index bbdb5131257c..3a8f078f6b1b 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -54672,35 +69559,255 @@ index bbdb5131257c..3a8f078f6b1b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("balanced_degradation_settings_gn")
+diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
+index ccc00e5296a1..54cef4764697 100644
+--- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
++++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("balanced_degradation_settings_gn")
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("bandwidth_quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-index 0eed1ad60f0d..5473da4ee117 100644
+index 66d21c66a349..8118147f993e 100644
--- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -54709,7 +69816,7 @@ index 0eed1ad60f0d..5473da4ee117 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54717,7 +69824,7 @@ index 0eed1ad60f0d..5473da4ee117 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -54758,6 +69865,7 @@ index 0eed1ad60f0d..5473da4ee117 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -54813,6 +69921,24 @@ index 0eed1ad60f0d..5473da4ee117 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -54846,10 +69972,10 @@ index 0eed1ad60f0d..5473da4ee117 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -54863,35 +69989,40 @@ index 0eed1ad60f0d..5473da4ee117 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("cpu_speed_experiment_gn")
-diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index 796860694d34..9828487f6eac 100644
---- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("cpu_speed_experiment_gn")
+diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
+index 1cf3a5d0f41f..ed59d2508985 100644
+--- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
++++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -54900,7 +70031,7 @@ index 796860694d34..9828487f6eac 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,164 +52,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54908,7 +70039,7 @@ index 796860694d34..9828487f6eac 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -54949,6 +70080,7 @@ index 796860694d34..9828487f6eac 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -55004,6 +70136,24 @@ index 796860694d34..9828487f6eac 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -55037,10 +70187,10 @@ index 796860694d34..9828487f6eac 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -55054,35 +70204,40 @@ index 796860694d34..9828487f6eac 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("field_trial_parser_gn")
-diff --git third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
-index 205bd45fa52e..4f0f7113c8cc 100644
---- third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("encoder_info_settings_gn")
+diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
+index 8147b9e99a24..3cd6aec92bc8 100644
+--- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
++++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -55091,7 +70246,7 @@ index 205bd45fa52e..4f0f7113c8cc 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55099,7 +70254,7 @@ index 205bd45fa52e..4f0f7113c8cc 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -55140,6 +70295,7 @@ index 205bd45fa52e..4f0f7113c8cc 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -55195,6 +70351,24 @@ index 205bd45fa52e..4f0f7113c8cc 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -55228,10 +70402,10 @@ index 205bd45fa52e..4f0f7113c8cc 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -55245,35 +70419,40 @@ index 205bd45fa52e..4f0f7113c8cc 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("jitter_upper_bound_experiment_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("field_trial_parser_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index 0c1a89402259..dfe03ddaab6e 100644
+index b8ece40f9b6e..cd41f4b0b645 100644
--- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -55282,7 +70461,7 @@ index 0c1a89402259..dfe03ddaab6e 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55290,7 +70469,7 @@ index 0c1a89402259..dfe03ddaab6e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -55331,6 +70510,7 @@ index 0c1a89402259..dfe03ddaab6e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -55386,6 +70566,24 @@ index 0c1a89402259..dfe03ddaab6e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -55419,10 +70617,10 @@ index 0c1a89402259..dfe03ddaab6e 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -55436,35 +70634,40 @@ index 0c1a89402259..dfe03ddaab6e 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("keyframe_interval_settings_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index ad278ad750e3..d6145dd57a40 100644
+index 0092a33c3916..0cbfa328d9ea 100644
--- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -55473,7 +70676,7 @@ index ad278ad750e3..d6145dd57a40 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55481,7 +70684,7 @@ index ad278ad750e3..d6145dd57a40 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -55522,6 +70725,7 @@ index ad278ad750e3..d6145dd57a40 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -55577,6 +70781,24 @@ index ad278ad750e3..d6145dd57a40 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -55610,10 +70832,10 @@ index ad278ad750e3..d6145dd57a40 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -55627,35 +70849,255 @@ index ad278ad750e3..d6145dd57a40 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("min_video_bitrate_experiment_gn")
+diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
+index acf592c7634f..2b4feb9b7bdc 100644
+--- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
++++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("min_video_bitrate_experiment_gn")
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("normalize_simulcast_size_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-index 9a719308c9e9..7b93898b9305 100644
+index aa454826f68b..1e8451135790 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -55664,7 +71106,7 @@ index 9a719308c9e9..7b93898b9305 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55672,7 +71114,7 @@ index 9a719308c9e9..7b93898b9305 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -55713,6 +71155,7 @@ index 9a719308c9e9..7b93898b9305 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -55768,6 +71211,24 @@ index 9a719308c9e9..7b93898b9305 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -55801,10 +71262,10 @@ index 9a719308c9e9..7b93898b9305 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -55818,35 +71279,40 @@ index 9a719308c9e9..7b93898b9305 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("quality_rampup_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index 0d22af1cf0d5..395d4e793243 100644
+index c8c2708eb734..dcc3d66af2f3 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -55855,7 +71321,7 @@ index 0d22af1cf0d5..395d4e793243 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55863,7 +71329,7 @@ index 0d22af1cf0d5..395d4e793243 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -55904,6 +71370,7 @@ index 0d22af1cf0d5..395d4e793243 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -55959,6 +71426,24 @@ index 0d22af1cf0d5..395d4e793243 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -55992,10 +71477,10 @@ index 0d22af1cf0d5..395d4e793243 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -56009,35 +71494,40 @@ index 0d22af1cf0d5..395d4e793243 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index e1c03ed03184..9f35859bb8b1 100644
+index 2a84caa1a115..f4eec0f9ca31 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -56046,7 +71536,7 @@ index e1c03ed03184..9f35859bb8b1 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56054,7 +71544,7 @@ index e1c03ed03184..9f35859bb8b1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -56095,6 +71585,7 @@ index e1c03ed03184..9f35859bb8b1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -56150,6 +71641,24 @@ index e1c03ed03184..9f35859bb8b1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -56183,10 +71692,10 @@ index e1c03ed03184..9f35859bb8b1 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -56200,35 +71709,40 @@ index e1c03ed03184..9f35859bb8b1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("quality_scaling_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index 49f1182f5e38..e103b1dfe277 100644
+index 6cbe9e8474cf..768d19687442 100644
--- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -56237,7 +71751,7 @@ index 49f1182f5e38..e103b1dfe277 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56245,7 +71759,7 @@ index 49f1182f5e38..e103b1dfe277 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -56286,6 +71800,7 @@ index 49f1182f5e38..e103b1dfe277 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -56341,6 +71856,24 @@ index 49f1182f5e38..e103b1dfe277 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -56374,10 +71907,10 @@ index 49f1182f5e38..e103b1dfe277 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -56391,35 +71924,40 @@ index 49f1182f5e38..e103b1dfe277 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rate_control_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-index 8a15fa313c96..da0cd0519b1f 100644
+index aea652b1063e..faed80b04af8 100644
--- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -56428,7 +71966,7 @@ index 8a15fa313c96..da0cd0519b1f 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56436,7 +71974,7 @@ index 8a15fa313c96..da0cd0519b1f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -56477,6 +72015,7 @@ index 8a15fa313c96..da0cd0519b1f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -56532,6 +72071,24 @@ index 8a15fa313c96..da0cd0519b1f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -56565,10 +72122,10 @@ index 8a15fa313c96..da0cd0519b1f 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -56582,35 +72139,40 @@ index 8a15fa313c96..da0cd0519b1f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtt_mult_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-index ba3b13a5f401..8b6e64b1cb26 100644
+index c1854a7f4dfb..5ba40788ff5d 100644
--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -56619,7 +72181,7 @@ index ba3b13a5f401..8b6e64b1cb26 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56627,7 +72189,7 @@ index ba3b13a5f401..8b6e64b1cb26 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -56668,6 +72230,7 @@ index ba3b13a5f401..8b6e64b1cb26 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -56723,6 +72286,24 @@ index ba3b13a5f401..8b6e64b1cb26 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -56756,10 +72337,10 @@ index ba3b13a5f401..8b6e64b1cb26 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -56773,35 +72354,40 @@ index ba3b13a5f401..8b6e64b1cb26 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("stable_target_rate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index 58ee1ed4807f..f7256ede9e0f 100644
+index a6650bd66393..393c4a6a5b5f 100644
--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -56810,7 +72396,7 @@ index 58ee1ed4807f..f7256ede9e0f 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56818,7 +72404,7 @@ index 58ee1ed4807f..f7256ede9e0f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -56855,6 +72441,7 @@ index 58ee1ed4807f..f7256ede9e0f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -56902,6 +72489,22 @@ index 58ee1ed4807f..f7256ede9e0f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -56923,9 +72526,10 @@ index 58ee1ed4807f..f7256ede9e0f 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 += [
@@ -56956,22 +72560,23 @@ index 58ee1ed4807f..f7256ede9e0f 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("gtest_prod_gn")
-diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index ed9683f8b8ea..7f853cc4d082 100644
---- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
+index 88e1ee554758..7f4ca498bb80 100644
+--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
++++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -56980,7 +72585,7 @@ index ed9683f8b8ea..7f853cc4d082 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56988,7 +72593,7 @@ index ed9683f8b8ea..7f853cc4d082 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -56998,6 +72603,10 @@ index ed9683f8b8ea..7f853cc4d082 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -57025,6 +72634,7 @@ index ed9683f8b8ea..7f853cc4d082 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -57068,10 +72678,32 @@ index ed9683f8b8ea..7f853cc4d082 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -57105,6 +72737,313 @@ index ed9683f8b8ea..7f853cc4d082 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("histogram_percentile_counter_gn")
+diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
+deleted file mode 100644
+index 01eeabbf70bc..000000000000
+--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
++++ /dev/null
+@@ -1,99 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["ANDROID"] = True
+-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-DEFINES["HAVE_SYS_UIO_H"] = True
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ANDROID"] = True
+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-OS_LIBS += [
+- "GLESv2",
+- "log"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["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
+-
+- OS_LIBS += [
+- "android_support",
+- "unwind"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+- OS_LIBS += [
+- "android_support"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("ifaddrs_android_gn")
+diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
+index d7b06159cea2..ede6074320d3 100644
+--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
++++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
- ]
@@ -57126,22 +73065,23 @@ index ed9683f8b8ea..7f853cc4d082 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("ignore_wundef_gn")
-diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 7a53cb844a09..e3906cc1cc9a 100644
---- third_party/libwebrtc/rtc_base/logging_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
+index a55837b63428..3310e1e14d3c 100644
+--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
++++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -57150,7 +73090,7 @@ index 7a53cb844a09..e3906cc1cc9a 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57158,7 +73098,7 @@ index 7a53cb844a09..e3906cc1cc9a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -57169,6 +73109,7 @@ index 7a53cb844a09..e3906cc1cc9a 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
@@ -57199,6 +73140,7 @@ index 7a53cb844a09..e3906cc1cc9a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -57235,6 +73177,9 @@ index 7a53cb844a09..e3906cc1cc9a 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -57254,6 +73199,24 @@ index 7a53cb844a09..e3906cc1cc9a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -57287,10 +73250,10 @@ index 7a53cb844a09..e3906cc1cc9a 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -57304,35 +73267,255 @@ index 7a53cb844a09..e3906cc1cc9a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("ip_address_gn")
+diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
+index a1b3462893f1..7363168e0153 100644
+--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
++++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
Library("logging_gn")
diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index 5f74a7fb3e88..c39e685fc872 100644
+index 372b4d28f8a7..3a1e46270270 100644
--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -57341,7 +73524,7 @@ index 5f74a7fb3e88..c39e685fc872 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57349,7 +73532,7 @@ index 5f74a7fb3e88..c39e685fc872 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -57386,6 +73569,7 @@ index 5f74a7fb3e88..c39e685fc872 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -57433,6 +73617,22 @@ index 5f74a7fb3e88..c39e685fc872 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -57454,9 +73654,10 @@ index 5f74a7fb3e88..c39e685fc872 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 += [
@@ -57488,21 +73689,22 @@ index 5f74a7fb3e88..c39e685fc872 100644
-
Library("macromagic_gn")
diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index 95d3a561c48d..fd6544852be2 100644
+index 139009098bab..eb01e8eadc57 100644
--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -57511,7 +73713,7 @@ index 95d3a561c48d..fd6544852be2 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57519,7 +73721,7 @@ index 95d3a561c48d..fd6544852be2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -57560,6 +73762,7 @@ index 95d3a561c48d..fd6544852be2 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -57611,6 +73814,24 @@ index 95d3a561c48d..fd6544852be2 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -57643,8 +73864,7 @@ index 95d3a561c48d..fd6544852be2 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -57662,10 +73882,208 @@ index 95d3a561c48d..fd6544852be2 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("aligned_malloc_gn")
+diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+index afe42b847585..ac5348af377a 100644
+--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
++++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -57673,23 +74091,436 @@ index 95d3a561c48d..fd6544852be2 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("aligned_malloc_gn")
+ 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 fdbf859c3749..d20ce225c3f9 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,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("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 4ac9a06df874..7f32da55511f 100644
+--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
++++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "GLESv2",
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("net_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index 48e810456b54..75a4524f7852 100644
+index cdcbaee77937..ea4f2aacc117 100644
--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -57698,7 +74529,7 @@ index 48e810456b54..75a4524f7852 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57706,7 +74537,7 @@ index 48e810456b54..75a4524f7852 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -57743,6 +74574,7 @@ index 48e810456b54..75a4524f7852 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -57794,6 +74626,24 @@ index 48e810456b54..75a4524f7852 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -57827,11 +74677,222 @@ index 48e810456b54..75a4524f7852 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("sent_packet_gn")
+diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
+index 9b7fb4a6703e..c5b7fcd69e98 100644
+--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
++++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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"
- ]
-
@@ -57844,35 +74905,251 @@ index 48e810456b54..75a4524f7852 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("network_constants_gn")
+diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build
+index 7b0f634578f3..1ec2058feb83 100644
+--- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
++++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("sent_packet_gn")
-diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index 2505bbb202bf..909662de36f2 100644
---- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("network_route_gn")
+diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
+index f77bcf8aa788..df6cf74c5b16 100644
+--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
++++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -57881,7 +75158,7 @@ index 2505bbb202bf..909662de36f2 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57889,7 +75166,7 @@ index 2505bbb202bf..909662de36f2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -57900,6 +75177,7 @@ index 2505bbb202bf..909662de36f2 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
@@ -57930,6 +75208,7 @@ index 2505bbb202bf..909662de36f2 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -57966,6 +75245,9 @@ index 2505bbb202bf..909662de36f2 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
+ DEFINES["_DEBUG"] = True
@@ -57985,6 +75267,24 @@ index 2505bbb202bf..909662de36f2 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -58018,9 +75318,211 @@ index 2505bbb202bf..909662de36f2 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("null_socket_server_gn")
+diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
+index ac24f995c6c1..a8d26b774863 100644
+--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
++++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
@@ -58035,35 +75537,246 @@ index 2505bbb202bf..909662de36f2 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ Library("one_time_event_gn")
+diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
+index c580f7e67a0a..3fea9a2d6b27 100644
+--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
++++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_GNU_SOURCE"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+-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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
Library("platform_thread_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index ad03c153be01..f4139ccc3455 100644
+index 713a9cc2fdf7..99ec083c6586 100644
--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -58072,7 +75785,7 @@ index ad03c153be01..f4139ccc3455 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58080,7 +75793,7 @@ index ad03c153be01..f4139ccc3455 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -58090,6 +75803,10 @@ index ad03c153be01..f4139ccc3455 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -58117,6 +75834,7 @@ index ad03c153be01..f4139ccc3455 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -58168,6 +75886,24 @@ index ad03c153be01..f4139ccc3455 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -58201,10 +75937,10 @@ index ad03c153be01..f4139ccc3455 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -58218,35 +75954,40 @@ index ad03c153be01..f4139ccc3455 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("platform_thread_types_gn")
diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index 220b4dc546a6..e2603dbb9a7e 100644
+index a5a3d7492137..d9d75b3b91be 100644
--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -58255,7 +75996,7 @@ index 220b4dc546a6..e2603dbb9a7e 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58263,7 +76004,7 @@ index 220b4dc546a6..e2603dbb9a7e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -58300,6 +76041,7 @@ index 220b4dc546a6..e2603dbb9a7e 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -58347,6 +76089,22 @@ index 220b4dc546a6..e2603dbb9a7e 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -58368,9 +76126,10 @@ index 220b4dc546a6..e2603dbb9a7e 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 += [
@@ -58401,22 +76160,23 @@ index 220b4dc546a6..e2603dbb9a7e 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("protobuf_utils_gn")
-diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index 5a4719b40967..c0860f3523c3 100644
---- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
+index 514f8957fee9..e3529cc2a54b 100644
+--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
++++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -58425,7 +76185,7 @@ index 5a4719b40967..c0860f3523c3 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58433,7 +76193,7 @@ index 5a4719b40967..c0860f3523c3 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -58471,13 +76231,10 @@ index 5a4719b40967..c0860f3523c3 100644
- 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_POSIX"] = True
@@ -58512,13 +76269,6 @@ index 5a4719b40967..c0860f3523c3 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":
@@ -58536,6 +76286,24 @@ index 5a4719b40967..c0860f3523c3 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -58568,8 +76336,7 @@ index 5a4719b40967..c0860f3523c3 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -58587,34 +76354,40 @@ index 5a4719b40967..c0860f3523c3 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rate_limiter_gn")
-diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index 58de50d22f5c..da5cfa7be0be 100644
---- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("race_checker_gn")
+diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
+index 9b3592566474..9c8984a140d6 100644
+--- third_party/libwebrtc/rtc_base/random_gn/moz.build
++++ third_party/libwebrtc/rtc_base/random_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -58623,7 +76396,7 @@ index 58de50d22f5c..da5cfa7be0be 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58631,7 +76404,7 @@ index 58de50d22f5c..da5cfa7be0be 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -58641,6 +76414,10 @@ index 58de50d22f5c..da5cfa7be0be 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -58668,6 +76445,7 @@ index 58de50d22f5c..da5cfa7be0be 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -58711,10 +76489,32 @@ index 58de50d22f5c..da5cfa7be0be 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -58748,6 +76548,10 @@ index 58de50d22f5c..da5cfa7be0be 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -58761,30 +76565,40 @@ index 58de50d22f5c..da5cfa7be0be 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("refcount_gn")
-diff --git third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build
-index c44f0df60918..27717bb75fc8 100644
---- third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("random_gn")
+diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
+index 969a79b712df..51b27be6a666 100644
+--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
++++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -58793,7 +76607,7 @@ index c44f0df60918..27717bb75fc8 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,168 +62,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58801,7 +76615,7 @@ index c44f0df60918..27717bb75fc8 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -58839,9 +76653,14 @@ index c44f0df60918..27717bb75fc8 100644
- 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_POSIX"] = True
@@ -58878,12 +76697,11 @@ index c44f0df60918..27717bb75fc8 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
- "winmm"
- ]
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/win/windows_version.cc"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -58901,6 +76719,24 @@ index c44f0df60918..27717bb75fc8 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -58933,8 +76769,7 @@ index c44f0df60918..27717bb75fc8 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -58952,34 +76787,40 @@ index c44f0df60918..27717bb75fc8 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("rtc_base_approved_gn")
-diff --git third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-index d3d695101667..be3c6b888802 100644
---- third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("rate_limiter_gn")
+diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
+index b40a4fdda662..ec6d4550feef 100644
+--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
++++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -58988,15 +76829,7 @@ index d3d695101667..be3c6b888802 100644
FINAL_LIBRARY = "webrtc"
-@@ -34,6 +43,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/ip_address.cc",
- "/third_party/libwebrtc/rtc_base/log_sinks.cc",
- "/third_party/libwebrtc/rtc_base/message_handler.cc",
-@@ -56,198 +66,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59004,7 +76837,7 @@ index d3d695101667..be3c6b888802 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -59015,15 +76848,9 @@ index d3d695101667..be3c6b888802 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc",
-- "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -59033,11 +76860,6 @@ index d3d695101667..be3c6b888802 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"
@@ -59053,18 +76875,225 @@ index d3d695101667..be3c6b888802 100644
- 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_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_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 += [
-- "dl",
-- "rt"
+- "winmm"
- ]
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["CPU_ARCH"] == "aarch64":
+
+ DEFINES["WEBRTC_ARCH_ARM64"] = True
+ DEFINES["WEBRTC_HAS_NEON"] = True
+
+-if CONFIG["CPU_ARCH"] == "arm":
-
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("rate_statistics_gn")
+diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
+index 26f81f4f5ed3..a7abd9b6b0e7 100644
+--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
++++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_POSIX"] = True
@@ -59074,10 +77103,6 @@ index d3d695101667..be3c6b888802 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
@@ -59092,7 +77117,6 @@ index d3d695101667..be3c6b888802 100644
- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
- DEFINES["WINVER"] = "0x0A00"
- DEFINES["_ATL_NO_OPENGL"] = True
-- DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
- DEFINES["_CRT_RAND_S"] = True
- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
@@ -59106,17 +77130,8 @@ index d3d695101667..be3c6b888802 100644
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
- "winmm"
- ]
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/win32.cc",
-- "/third_party/libwebrtc/rtc_base/win32_socket_server.cc",
-- "/third_party/libwebrtc/rtc_base/win32_window.cc"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -59134,6 +77149,24 @@ index d3d695101667..be3c6b888802 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -59166,8 +77199,7 @@ index d3d695101667..be3c6b888802 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -59185,10 +77217,204 @@ index d3d695101667..be3c6b888802 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("rate_tracker_gn")
+diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
+index f8c49daa900e..091d88e0545b 100644
+--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
++++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -59196,23 +77422,217 @@ index d3d695101667..be3c6b888802 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("rtc_base_gn")
+ Library("refcount_gn")
+diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
+index eef6c6bc5d45..f04b9eb51ce7 100644
+--- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
++++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("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 de2d81e60011..8220755afb39 100644
+index db71c35a1add..d03fb3f4e7c8 100644
--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -59221,7 +77641,7 @@ index de2d81e60011..8220755afb39 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59229,7 +77649,7 @@ index de2d81e60011..8220755afb39 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -59270,6 +77690,7 @@ index de2d81e60011..8220755afb39 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -59304,6 +77725,10 @@ index de2d81e60011..8220755afb39 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -59321,6 +77746,24 @@ index de2d81e60011..8220755afb39 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -59353,8 +77796,7 @@ index de2d81e60011..8220755afb39 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -59372,34 +77814,40 @@ index de2d81e60011..8220755afb39 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtc_event_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index ddb6df7919ab..17814a3cc24a 100644
+index 65d2c5bb2a2b..1b6e8cb951db 100644
--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -59408,7 +77856,7 @@ index ddb6df7919ab..17814a3cc24a 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59416,7 +77864,7 @@ index ddb6df7919ab..17814a3cc24a 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -59457,6 +77905,7 @@ index ddb6df7919ab..17814a3cc24a 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -59491,10 +77940,6 @@ index ddb6df7919ab..17814a3cc24a 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -59512,6 +77957,24 @@ index ddb6df7919ab..17814a3cc24a 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -59545,10 +78008,10 @@ index ddb6df7919ab..17814a3cc24a 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -59562,35 +78025,40 @@ index ddb6df7919ab..17814a3cc24a 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtc_numerics_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-index 7ddc659b10cc..29edd94b27df 100644
+index ae0702954d53..8e76dcf845cb 100644
--- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -59599,7 +78067,7 @@ index 7ddc659b10cc..29edd94b27df 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59607,7 +78075,7 @@ index 7ddc659b10cc..29edd94b27df 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -59648,6 +78116,7 @@ index 7ddc659b10cc..29edd94b27df 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -59699,6 +78168,24 @@ index 7ddc659b10cc..29edd94b27df 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -59731,8 +78218,7 @@ index 7ddc659b10cc..29edd94b27df 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -59750,34 +78236,40 @@ index 7ddc659b10cc..29edd94b27df 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("rtc_task_queue_gn")
diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index d9eff0756143..aeb9fff60f31 100644
+index 706eb51c9788..5dba9b3a8401 100644
--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -59786,7 +78278,7 @@ index d9eff0756143..aeb9fff60f31 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59794,7 +78286,7 @@ index d9eff0756143..aeb9fff60f31 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -59831,6 +78323,7 @@ index d9eff0756143..aeb9fff60f31 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -59878,6 +78371,22 @@ index d9eff0756143..aeb9fff60f31 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -59899,9 +78408,10 @@ index d9eff0756143..aeb9fff60f31 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 += [
@@ -59933,21 +78443,22 @@ index d9eff0756143..aeb9fff60f31 100644
-
Library("safe_compare_gn")
diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index 14051d1182b5..0492472620c0 100644
+index 545467bc2319..bc31d2ede82f 100644
--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -59956,7 +78467,7 @@ index 14051d1182b5..0492472620c0 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59964,7 +78475,7 @@ index 14051d1182b5..0492472620c0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -60005,6 +78516,7 @@ index 14051d1182b5..0492472620c0 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -60052,6 +78564,22 @@ index 14051d1182b5..0492472620c0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -60073,9 +78601,10 @@ index 14051d1182b5..0492472620c0 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 += [
@@ -60107,21 +78636,22 @@ index 14051d1182b5..0492472620c0 100644
-
Library("safe_conversions_gn")
diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index e23ba45efdfa..d813100d1516 100644
+index 51c1b7bacdf8..fb72b6128335 100644
--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -60130,7 +78660,7 @@ index e23ba45efdfa..d813100d1516 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60138,7 +78668,7 @@ index e23ba45efdfa..d813100d1516 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -60179,6 +78709,7 @@ index e23ba45efdfa..d813100d1516 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -60226,6 +78757,22 @@ index e23ba45efdfa..d813100d1516 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -60247,9 +78794,10 @@ index e23ba45efdfa..d813100d1516 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 += [
@@ -60280,22 +78828,23 @@ index e23ba45efdfa..d813100d1516 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("safe_minmax_gn")
-diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-index c79228b49449..c8052f5370f9 100644
---- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
+index a477e2cd2de2..f8c37e47fe73 100644
+--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
++++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -60304,7 +78853,7 @@ index c79228b49449..c8052f5370f9 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60312,7 +78861,7 @@ index c79228b49449..c8052f5370f9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -60322,6 +78871,10 @@ index c79228b49449..c8052f5370f9 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -60349,6 +78902,7 @@ index c79228b49449..c8052f5370f9 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -60392,10 +78946,32 @@ index c79228b49449..c8052f5370f9 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -60429,6 +79005,208 @@ index c79228b49449..c8052f5370f9 100644
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("sample_counter_gn")
+diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
+index efdfb15485e3..d22a78d96416 100644
+--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
++++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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"
- ]
@@ -60450,22 +79228,23 @@ index c79228b49449..c8052f5370f9 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("sanitizer_gn")
-diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index d2438210af52..3ed02b71257d 100644
---- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
+index 8315d358e6ec..40ffca5c22d9 100644
+--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
++++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -60474,7 +79253,7 @@ index d2438210af52..3ed02b71257d 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,160 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60482,7 +79261,7 @@ index d2438210af52..3ed02b71257d 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -60493,6 +79272,7 @@ index d2438210af52..3ed02b71257d 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
@@ -60523,6 +79303,7 @@ index d2438210af52..3ed02b71257d 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -60557,6 +79338,13 @@ index d2438210af52..3ed02b71257d 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":
@@ -60574,6 +79362,24 @@ index d2438210af52..3ed02b71257d 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -60606,8 +79412,7 @@ index d2438210af52..3ed02b71257d 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -60625,34 +79430,241 @@ index d2438210af52..3ed02b71257d 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("socket_address_gn")
+diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
+index 43a7eff46eba..4ba64ef8e106 100644
+--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
++++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "GLESv2",
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- Library("stringutils_gn")
-diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-index 9916bbdc542a..7a927cc9e3ed 100644
---- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("socket_factory_gn")
+diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
+index 8fa7b5f8b019..d603411799ed 100644
+--- third_party/libwebrtc/rtc_base/socket_gn/moz.build
++++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -60661,7 +79673,7 @@ index 9916bbdc542a..7a927cc9e3ed 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60669,7 +79681,7 @@ index 9916bbdc542a..7a927cc9e3ed 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -60680,6 +79692,7 @@ index 9916bbdc542a..7a927cc9e3ed 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
+- "GLESv2",
- "log"
- ]
-
@@ -60710,6 +79723,7 @@ index 9916bbdc542a..7a927cc9e3ed 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -60744,6 +79758,13 @@ index 9916bbdc542a..7a927cc9e3ed 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":
@@ -60761,6 +79782,24 @@ index 9916bbdc542a..7a927cc9e3ed 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -60793,8 +79832,7 @@ index 9916bbdc542a..7a927cc9e3ed 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -60812,34 +79850,40 @@ index 9916bbdc542a..7a927cc9e3ed 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("mutex_gn")
-diff --git third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build
-index 10fcd89c276d..16f607e466b4 100644
---- third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("socket_gn")
+diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
+index 19fae93cf479..8f5896e37a22 100644
+--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
++++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -60848,15 +79892,7 @@ index 10fcd89c276d..16f607e466b4 100644
FINAL_LIBRARY = "webrtc"
-@@ -28,6 +37,7 @@ LOCAL_INCLUDES += [
- ]
-
- UNIFIED_SOURCES += [
-+ "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc",
- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_wrapper.cc"
- ]
-
-@@ -40,180 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60864,7 +79900,7 @@ index 10fcd89c276d..16f607e466b4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -60874,8 +79910,9 @@ index 10fcd89c276d..16f607e466b4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc"
+- OS_LIBS += [
+- "GLESv2",
+- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
@@ -60887,10 +79924,6 @@ index 10fcd89c276d..16f607e466b4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_AURA"] = "1"
@@ -60906,13 +79939,10 @@ index 10fcd89c276d..16f607e466b4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc"
-- ]
--
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -60922,10 +79952,202 @@ index 10fcd89c276d..16f607e466b4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_posix.cc"
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+- DEFINES["NOMINMAX"] = True
+- DEFINES["NTDDI_VERSION"] = "0x0A000000"
+- DEFINES["PSAPI_VERSION"] = "2"
+- DEFINES["UNICODE"] = True
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["WEBRTC_WIN"] = True
+- DEFINES["WIN32"] = True
+- DEFINES["WIN32_LEAN_AND_MEAN"] = True
+- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+- DEFINES["WINVER"] = "0x0A00"
+- DEFINES["_ATL_NO_OPENGL"] = True
+- DEFINES["_CRT_RAND_S"] = True
+- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+- DEFINES["_HAS_EXCEPTIONS"] = "0"
+- DEFINES["_HAS_NODISCARD"] = True
+- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+- DEFINES["_SECURE_ATL"] = True
+- DEFINES["_UNICODE"] = True
+- DEFINES["_WIN32_WINNT"] = "0x0A00"
+- DEFINES["_WINDOWS"] = True
+- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("socket_server_gn")
+diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build
+index 79c9fd515372..ed15371747a9 100644
+--- third_party/libwebrtc/rtc_base/ssl_gn/moz.build
++++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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
@@ -60951,14 +80173,199 @@ index 10fcd89c276d..16f607e466b4 100644
- 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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
-- "winmm"
+- "android_support",
+- "unwind"
- ]
-
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/rtc_base/synchronization/rw_lock_win.cc"
+-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("ssl_gn")
+diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
+index c2ae423ea9b5..a65888b3d464 100644
+--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
++++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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"
+
+@@ -47,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
@@ -60976,6 +80383,24 @@ index 10fcd89c276d..16f607e466b4 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -61008,8 +80433,7 @@ index 10fcd89c276d..16f607e466b4 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -61027,10 +80451,208 @@ index 10fcd89c276d..16f607e466b4 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("stringutils_gn")
+diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
+index 630648f5f5fa..2863ba28d144 100644
+--- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
++++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -61038,23 +80660,217 @@ index 10fcd89c276d..16f607e466b4 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("rw_lock_wrapper_gn")
-diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build
-index 45b4ce477f94..9c964e79f915 100644
---- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+ Library("swap_queue_gn")
+diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
+index 34792dc4327c..fc8b3b58110e 100644
+--- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
++++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("mutex_gn")
+diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
+index 85cf1f73b599..fb8a358b2eaa 100644
+--- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
++++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -61063,7 +80879,7 @@ index 45b4ce477f94..9c964e79f915 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61071,7 +80887,7 @@ index 45b4ce477f94..9c964e79f915 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -61112,6 +80928,7 @@ index 45b4ce477f94..9c964e79f915 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -61163,6 +80980,24 @@ index 45b4ce477f94..9c964e79f915 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -61195,8 +81030,7 @@ index 45b4ce477f94..9c964e79f915 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -61214,34 +81048,40 @@ index 45b4ce477f94..9c964e79f915 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("sequence_checker_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("sequence_checker_internal_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-index 5cc41102ca63..9bc9bed9472c 100644
+index 363b084539be..1fe57f535305 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -61250,7 +81090,7 @@ index 5cc41102ca63..9bc9bed9472c 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61258,7 +81098,7 @@ index 5cc41102ca63..9bc9bed9472c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -61295,6 +81135,7 @@ index 5cc41102ca63..9bc9bed9472c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -61346,6 +81187,24 @@ index 5cc41102ca63..9bc9bed9472c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -61379,10 +81238,10 @@ index 5cc41102ca63..9bc9bed9472c 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -61396,35 +81255,40 @@ index 5cc41102ca63..9bc9bed9472c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("yield_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-index 5db0a535e612..505db352b5af 100644
+index 9356f30910a3..edfb4475bbd2 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -61433,7 +81297,7 @@ index 5db0a535e612..505db352b5af 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61441,7 +81305,7 @@ index 5db0a535e612..505db352b5af 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -61482,6 +81346,7 @@ index 5db0a535e612..505db352b5af 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -61533,6 +81398,24 @@ index 5db0a535e612..505db352b5af 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -61565,8 +81448,7 @@ index 5db0a535e612..505db352b5af 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -61584,34 +81466,40 @@ index 5db0a535e612..505db352b5af 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("yield_policy_gn")
diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-index 37d5eb9f295f..d9d2596f4fb8 100644
+index 4f8f93c154e2..a836f5db63f0 100644
--- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -61620,7 +81508,7 @@ index 37d5eb9f295f..d9d2596f4fb8 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61628,7 +81516,7 @@ index 37d5eb9f295f..d9d2596f4fb8 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -61665,6 +81553,7 @@ index 37d5eb9f295f..d9d2596f4fb8 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -61712,6 +81601,22 @@ index 37d5eb9f295f..d9d2596f4fb8 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -61733,9 +81638,10 @@ index 37d5eb9f295f..d9d2596f4fb8 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 += [
@@ -61766,22 +81672,182 @@ index 37d5eb9f295f..d9d2596f4fb8 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("arch_gn")
+diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
+deleted file mode 100644
+index ab3e701885e8..000000000000
+--- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
++++ /dev/null
+@@ -1,80 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["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
+-
+- OS_LIBS += [
+- "android_support",
+- "unwind"
+- ]
+-
+-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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("asm_defines_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 f897cf46fc39..000000000000
+--- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
++++ /dev/null
+@@ -1,67 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CMMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/system/cocoa_threading.mm"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("cocoa_threading_gn")
diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-index 37fc7cfc1659..6fc25ea08ead 100644
+index 9954e2772e10..7cc6dfb3b3a6 100644
--- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -61790,7 +81856,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61798,7 +81864,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -61839,6 +81905,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -61890,6 +81957,24 @@ index 37fc7cfc1659..6fc25ea08ead 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -61922,8 +82007,7 @@ index 37fc7cfc1659..6fc25ea08ead 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -61941,34 +82025,113 @@ index 37fc7cfc1659..6fc25ea08ead 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("file_wrapper_gn")
+diff --git third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
+deleted file mode 100644
+index 99fbd80dd967..000000000000
+--- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
++++ /dev/null
+@@ -1,67 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/system/gcd_helpers.m"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("gcd_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-index 4ccf3744cb41..60dd57a72036 100644
+index 396d7286299f..ae27ee47b74f 100644
--- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -61977,7 +82140,7 @@ index 4ccf3744cb41..60dd57a72036 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61985,7 +82148,7 @@ index 4ccf3744cb41..60dd57a72036 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -62022,6 +82185,7 @@ index 4ccf3744cb41..60dd57a72036 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -62069,6 +82233,22 @@ index 4ccf3744cb41..60dd57a72036 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -62090,9 +82270,10 @@ index 4ccf3744cb41..60dd57a72036 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 += [
@@ -62124,21 +82305,22 @@ index 4ccf3744cb41..60dd57a72036 100644
-
Library("ignore_warnings_gn")
diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-index 6632c7c906bd..edc16b5cea28 100644
+index 110c04a6be19..47a6efea00c5 100644
--- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -62147,7 +82329,7 @@ index 6632c7c906bd..edc16b5cea28 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62155,7 +82337,7 @@ index 6632c7c906bd..edc16b5cea28 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -62192,6 +82374,7 @@ index 6632c7c906bd..edc16b5cea28 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -62239,6 +82422,22 @@ index 6632c7c906bd..edc16b5cea28 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -62260,9 +82459,10 @@ index 6632c7c906bd..edc16b5cea28 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 += [
@@ -62293,22 +82493,23 @@ index 6632c7c906bd..edc16b5cea28 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("inline_gn")
-diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-index 2b01a6c41327..7de80905a1b7 100644
---- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
+index bbf86f67bb61..8b4b89ce8c24 100644
+--- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
++++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -62317,7 +82518,7 @@ index 2b01a6c41327..7de80905a1b7 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62325,7 +82526,7 @@ index 2b01a6c41327..7de80905a1b7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -62362,6 +82563,7 @@ index 2b01a6c41327..7de80905a1b7 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -62409,6 +82611,22 @@ index 2b01a6c41327..7de80905a1b7 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -62430,9 +82648,10 @@ index 2b01a6c41327..7de80905a1b7 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 += [
@@ -62462,23 +82681,24 @@ index 2b01a6c41327..7de80905a1b7 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("rtc_export_gn")
-diff --git third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build
-index b8ef888289a7..63c0fb778203 100644
---- third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/system/thread_registry_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("no_unique_address_gn")
+diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
+index a26fbd0aecc7..7773038a2267 100644
+--- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
++++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -62487,7 +82707,7 @@ index b8ef888289a7..63c0fb778203 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62495,7 +82715,7 @@ index b8ef888289a7..63c0fb778203 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -62505,10 +82725,6 @@ index b8ef888289a7..63c0fb778203 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -62536,6 +82752,7 @@ index b8ef888289a7..63c0fb778203 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -62570,10 +82787,6 @@ index b8ef888289a7..63c0fb778203 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -62587,6 +82800,22 @@ index b8ef888289a7..63c0fb778203 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -62608,9 +82837,10 @@ index b8ef888289a7..63c0fb778203 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 += [
@@ -62640,23 +82870,24 @@ index b8ef888289a7..63c0fb778203 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("thread_registry_gn")
+ Library("rtc_export_gn")
diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-index 5509ed80f3eb..e43825679798 100644
+index c53e1ab3ba55..3c5c6131f5b6 100644
--- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -62665,7 +82896,7 @@ index 5509ed80f3eb..e43825679798 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62673,7 +82904,7 @@ index 5509ed80f3eb..e43825679798 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -62710,6 +82941,7 @@ index 5509ed80f3eb..e43825679798 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -62757,6 +82989,22 @@ index 5509ed80f3eb..e43825679798 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -62778,9 +83026,10 @@ index 5509ed80f3eb..e43825679798 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 += [
@@ -62812,21 +83061,22 @@ index 5509ed80f3eb..e43825679798 100644
-
Library("unused_gn")
diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-index 79be38a5fcea..cda637ed1b4b 100644
+index 6d5043ae77f0..68764f971a8c 100644
--- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -62835,7 +83085,7 @@ index 79be38a5fcea..cda637ed1b4b 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62843,7 +83093,7 @@ index 79be38a5fcea..cda637ed1b4b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -62880,6 +83130,7 @@ index 79be38a5fcea..cda637ed1b4b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -62927,6 +83178,22 @@ index 79be38a5fcea..cda637ed1b4b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -62948,9 +83215,10 @@ index 79be38a5fcea..cda637ed1b4b 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 += [
@@ -62981,22 +83249,23 @@ index 79be38a5fcea..cda637ed1b4b 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("warn_current_thread_is_deadlocked_gn")
-diff --git third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
-index ad1b375c0b0d..37428808cbc0 100644
---- third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
+index 8aecd5889008..677563f0eafb 100644
+--- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
++++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -63005,7 +83274,7 @@ index ad1b375c0b0d..37428808cbc0 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63013,7 +83282,7 @@ index ad1b375c0b0d..37428808cbc0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -63051,9 +83320,14 @@ index ad1b375c0b0d..37428808cbc0 100644
- 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_POSIX"] = True
@@ -63088,6 +83362,13 @@ index ad1b375c0b0d..37428808cbc0 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":
@@ -63105,6 +83386,24 @@ index ad1b375c0b0d..37428808cbc0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -63137,8 +83436,7 @@ index ad1b375c0b0d..37428808cbc0 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -63156,34 +83454,40 @@ index ad1b375c0b0d..37428808cbc0 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("pending_task_safety_flag_gn")
-diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-index 6f2570a95f09..d0817cac95aa 100644
---- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("repeating_task_gn")
+diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
+index 6077e21b3779..af27c83c7e93 100644
+--- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
++++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -63192,7 +83496,7 @@ index 6f2570a95f09..d0817cac95aa 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,171 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63200,7 +83504,7 @@ index 6f2570a95f09..d0817cac95aa 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -63238,13 +83542,10 @@ index 6f2570a95f09..d0817cac95aa 100644
- 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_POSIX"] = True
@@ -63279,13 +83580,6 @@ index 6f2570a95f09..d0817cac95aa 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":
@@ -63303,6 +83597,24 @@ index 6f2570a95f09..d0817cac95aa 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -63335,8 +83647,7 @@ index 6f2570a95f09..d0817cac95aa 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -63354,34 +83665,40 @@ index 6f2570a95f09..d0817cac95aa 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("repeating_task_gn")
-diff --git third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
-index 3303f5bb5949..2f3734d0d080 100644
---- third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("base64_gn")
+diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
+index 3f4690993100..c78bc1de22c4 100644
+--- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
++++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -63390,7 +83707,7 @@ index 3303f5bb5949..2f3734d0d080 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63398,7 +83715,7 @@ index 3303f5bb5949..2f3734d0d080 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -63408,10 +83725,6 @@ index 3303f5bb5949..2f3734d0d080 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -63439,6 +83752,7 @@ index 3303f5bb5949..2f3734d0d080 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -63482,10 +83796,32 @@ index 3303f5bb5949..2f3734d0d080 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -63519,6 +83855,10 @@ index 3303f5bb5949..2f3734d0d080 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -63532,30 +83872,40 @@ index 3303f5bb5949..2f3734d0d080 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("to_queued_task_gn")
-diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-index fe1886165d68..600f30c98b75 100644
---- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("sigslot_gn")
+diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
+index 39235d88fc45..74684735d856 100644
+--- third_party/libwebrtc/rtc_base/threading_gn/moz.build
++++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -63564,7 +83914,7 @@ index fe1886165d68..600f30c98b75 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,187 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63572,7 +83922,7 @@ index fe1886165d68..600f30c98b75 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -63582,6 +83932,11 @@ index fe1886165d68..600f30c98b75 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "GLESv2",
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -63609,6 +83964,7 @@ index fe1886165d68..600f30c98b75 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -63643,6 +83999,13 @@ index fe1886165d68..600f30c98b75 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":
@@ -63660,6 +84023,24 @@ index fe1886165d68..600f30c98b75 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -63693,10 +84074,10 @@ index fe1886165d68..600f30c98b75 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -63710,35 +84091,41 @@ index fe1886165d68..600f30c98b75 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("base64_gn")
-diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-index 8b527fdfbe54..ac5990efe31c 100644
---- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("threading_gn")
+diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
+index 3f184279a3a0..432c438bdad6 100644
+--- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
++++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
+@@ -12,12 +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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -63747,7 +84134,7 @@ index 8b527fdfbe54..ac5990efe31c 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,156 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63755,7 +84142,7 @@ index 8b527fdfbe54..ac5990efe31c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -63765,6 +84152,10 @@ index 8b527fdfbe54..ac5990efe31c 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -63792,6 +84183,7 @@ index 8b527fdfbe54..ac5990efe31c 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -63826,6 +84218,10 @@ index 8b527fdfbe54..ac5990efe31c 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -63843,6 +84239,24 @@ index 8b527fdfbe54..ac5990efe31c 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -63876,10 +84290,10 @@ index 8b527fdfbe54..ac5990efe31c 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -63893,35 +84307,40 @@ index 8b527fdfbe54..ac5990efe31c 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("sigslot_gn")
-diff --git third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build
-index 2469b6d79c69..f2b11da26cd9 100644
---- third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("timeutils_gn")
+diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
+index b5c9fb51224c..7ff959ba5f38 100644
+--- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
++++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -63930,7 +84349,7 @@ index 2469b6d79c69..f2b11da26cd9 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63938,7 +84357,7 @@ index 2469b6d79c69..f2b11da26cd9 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -63948,10 +84367,6 @@ index 2469b6d79c69..f2b11da26cd9 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-- OS_LIBS += [
-- "log"
-- ]
--
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -63979,6 +84394,7 @@ index 2469b6d79c69..f2b11da26cd9 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -64026,6 +84442,22 @@ index 2469b6d79c69..f2b11da26cd9 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -64047,9 +84479,10 @@ index 2469b6d79c69..f2b11da26cd9 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 += [
@@ -64079,23 +84512,24 @@ index 2469b6d79c69..f2b11da26cd9 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("thread_checker_gn")
-diff --git third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
-index 27bf23bfc704..7609b873b4e3 100644
---- third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ Library("type_traits_gn")
+diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
+index 4ff4d51c78ea..93be9abd91cd 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -64104,7 +84538,7 @@ index 27bf23bfc704..7609b873b4e3 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64112,7 +84546,7 @@ index 27bf23bfc704..7609b873b4e3 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -64149,6 +84583,7 @@ index 27bf23bfc704..7609b873b4e3 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -64183,10 +84618,6 @@ index 27bf23bfc704..7609b873b4e3 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -64196,14 +84627,26 @@ index 27bf23bfc704..7609b873b4e3 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -64225,9 +84668,10 @@ index 27bf23bfc704..7609b873b4e3 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 += [
@@ -64236,12 +84680,7 @@ index 27bf23bfc704..7609b873b4e3 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -64256,34 +84695,30 @@ index 27bf23bfc704..7609b873b4e3 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("timestamp_extrapolator_gn")
-diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-index b82a9e574f7a..d8ebfee4b28f 100644
---- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
-
+ 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 35e3af076731..22bf007b975e 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,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
DEFINES["WEBRTC_LIBRARY_IMPL"] = True
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -64292,7 +84727,7 @@ index b82a9e574f7a..d8ebfee4b28f 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,164 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64300,7 +84735,7 @@ index b82a9e574f7a..d8ebfee4b28f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -64341,6 +84776,7 @@ index b82a9e574f7a..d8ebfee4b28f 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -64375,10 +84811,6 @@ index b82a9e574f7a..d8ebfee4b28f 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -64388,14 +84820,26 @@ index b82a9e574f7a..d8ebfee4b28f 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -64417,9 +84861,10 @@ index b82a9e574f7a..d8ebfee4b28f 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 += [
@@ -64429,10 +84874,6 @@ index b82a9e574f7a..d8ebfee4b28f 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- OS_LIBS += [
- "android_support"
- ]
@@ -64446,35 +84887,31 @@ index b82a9e574f7a..d8ebfee4b28f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("timeutils_gn")
-diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-index 7a7f9ecb0a88..fb9c6beac4ce 100644
---- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+ 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 93a833f2a3a7..c1c245b6e62b 100644
+--- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
++++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -64483,7 +84920,7 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,144 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64491,7 +84928,7 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -64501,6 +84938,10 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -64528,6 +84969,7 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -64571,10 +85013,32 @@ index 7a7f9ecb0a88..fb9c6beac4ce 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -64608,6 +85072,10 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -64621,30 +85089,499 @@ index 7a7f9ecb0a88..fb9c6beac4ce 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- 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 c6e8a0edb162..11dfe34ae456 100644
---- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("weak_ptr_gn")
+diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
+deleted file mode 100644
+index d5882af2bb01..000000000000
+--- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
++++ /dev/null
+@@ -1,84 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-DEFINES["NOMINMAX"] = True
+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PSAPI_VERSION"] = "2"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["UNICODE"] = True
+-DEFINES["USE_AURA"] = "1"
+-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_STRICT_FIELD_TRIALS"] = "0"
+-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
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/win/create_direct3d_device.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("create_direct3d_device_gn")
+diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
+deleted file mode 100644
+index d2449d9860b7..000000000000
+--- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
++++ /dev/null
+@@ -1,84 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-DEFINES["NOMINMAX"] = True
+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PSAPI_VERSION"] = "2"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["UNICODE"] = True
+-DEFINES["USE_AURA"] = "1"
+-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_STRICT_FIELD_TRIALS"] = "0"
+-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
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/win/get_activation_factory.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("get_activation_factory_gn")
+diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
+deleted file mode 100644
+index 3a495f5b6ca0..000000000000
+--- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
++++ /dev/null
+@@ -1,84 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-DEFINES["NOMINMAX"] = True
+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PSAPI_VERSION"] = "2"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["UNICODE"] = True
+-DEFINES["USE_AURA"] = "1"
+-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_STRICT_FIELD_TRIALS"] = "0"
+-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
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-SOURCES += [
+- "/third_party/libwebrtc/rtc_base/win/hstring.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("hstring_gn")
+diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
+deleted file mode 100644
+index 88dc67ea4893..000000000000
+--- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
++++ /dev/null
+@@ -1,84 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-DEFINES["NOMINMAX"] = True
+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PSAPI_VERSION"] = "2"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["UNICODE"] = True
+-DEFINES["USE_AURA"] = "1"
+-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_STRICT_FIELD_TRIALS"] = "0"
+-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
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/win/windows_version.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("windows_version_gn")
+diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
+deleted file mode 100644
+index 656bd4014be6..000000000000
+--- third_party/libwebrtc/rtc_base/win32_gn/moz.build
++++ /dev/null
+@@ -1,93 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-DEFINES["NOMINMAX"] = True
+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PSAPI_VERSION"] = "2"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["UNICODE"] = True
+-DEFINES["USE_AURA"] = "1"
+-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_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["WEBRTC_WIN"] = True
+-DEFINES["WIN32"] = True
+-DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-DEFINES["WINVER"] = "0x0A00"
+-DEFINES["_ATL_NO_OPENGL"] = True
+-DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = 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
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/win32.cc",
+- "/third_party/libwebrtc/rtc_base/win32_window.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("win32_gn")
+diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
+index b186530b19c6..eaf3581aaff9 100644
+--- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
++++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -64653,7 +85590,7 @@ index c6e8a0edb162..11dfe34ae456 100644
FINAL_LIBRARY = "webrtc"
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64661,7 +85598,7 @@ index c6e8a0edb162..11dfe34ae456 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -64702,6 +85639,7 @@ index c6e8a0edb162..11dfe34ae456 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -64745,10 +85683,32 @@ index c6e8a0edb162..11dfe34ae456 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -64782,6 +85742,10 @@ index c6e8a0edb162..11dfe34ae456 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -64795,30 +85759,361 @@ index c6e8a0edb162..11dfe34ae456 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- 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 0934a884cdfa..8331fbaf8cf0 100644
---- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
++ DEFINES["USE_X11"] = "1"
+ Library("zero_memory_gn")
+diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
+deleted file mode 100644
+index 976c7fceb752..000000000000
+--- third_party/libwebrtc/sdk/base_objc_gn/moz.build
++++ /dev/null
+@@ -1,79 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-CMMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/sdk/objc/",
+- "/third_party/libwebrtc/sdk/objc/base/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/sdk/objc/base/RTCEncodedImage.m",
+- "/third_party/libwebrtc/sdk/objc/base/RTCLogging.mm",
+- "/third_party/libwebrtc/sdk/objc/base/RTCVideoCapturer.m",
+- "/third_party/libwebrtc/sdk/objc/base/RTCVideoCodecInfo.m",
+- "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderQpThresholds.m",
+- "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderSettings.m",
+- "/third_party/libwebrtc/sdk/objc/base/RTCVideoFrame.mm"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("base_objc_gn")
+diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
+deleted file mode 100644
+index 7634e1aa7bb0..000000000000
+--- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
++++ /dev/null
+@@ -1,75 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-CMMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/sdk/objc/",
+- "/third_party/libwebrtc/sdk/objc/base/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/sdk/objc/helpers/AVCaptureSession+DevicePosition.mm",
+- "/third_party/libwebrtc/sdk/objc/helpers/NSString+StdString.mm",
+- "/third_party/libwebrtc/sdk/objc/helpers/RTCDispatcher.m"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("helpers_objc_gn")
+diff --git third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
+deleted file mode 100644
+index 64a7dbcb6366..000000000000
+--- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
++++ /dev/null
+@@ -1,70 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/sdk/objc/",
+- "/third_party/libwebrtc/sdk/objc/base/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/sdk/objc/components/capturer/RTCCameraVideoCapturer.m",
+- "/third_party/libwebrtc/sdk/objc/components/capturer/RTCFileVideoCapturer.m"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("videocapture_objc_gn")
+diff --git third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
+deleted file mode 100644
+index dea03fa57466..000000000000
+--- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
++++ /dev/null
+@@ -1,73 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CMMFLAGS += [
+- "-fobjc-arc"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = 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["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/media/libyuv/",
+- "/media/libyuv/libyuv/include/",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/sdk/objc/",
+- "/third_party/libwebrtc/sdk/objc/base/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm",
+- "/third_party/libwebrtc/sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.mm",
+- "/third_party/libwebrtc/sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.mm"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-Library("videoframebuffer_objc_gn")
+diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
+index 10482ec2ea89..064ddd6f7ea0 100644
+--- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
++++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -64827,7 +86122,7 @@ index 0934a884cdfa..8331fbaf8cf0 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,160 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64835,7 +86130,7 @@ index 0934a884cdfa..8331fbaf8cf0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -64876,6 +86171,7 @@ index 0934a884cdfa..8331fbaf8cf0 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -64927,6 +86223,24 @@ index 0934a884cdfa..8331fbaf8cf0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -64959,8 +86273,7 @@ index 0934a884cdfa..8331fbaf8cf0 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -64978,34 +86291,40 @@ index 0934a884cdfa..8331fbaf8cf0 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
- Library("weak_ptr_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("denormal_disabler_gn")
diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-index a95460f990e5..e917884b17e1 100644
+index 9bbb11725944..53f2c83c65cc 100644
--- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -65014,7 +86333,7 @@ index a95460f990e5..e917884b17e1 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65022,7 +86341,7 @@ index a95460f990e5..e917884b17e1 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -65063,6 +86382,7 @@ index a95460f990e5..e917884b17e1 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -65118,6 +86438,24 @@ index a95460f990e5..e917884b17e1 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -65151,10 +86489,10 @@ index a95460f990e5..e917884b17e1 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -65168,35 +86506,40 @@ index a95460f990e5..e917884b17e1 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("field_trial_gn")
diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-index 75e7b07f3e00..3d357294d83b 100644
+index b4982671c9fb..a5e24c852a0d 100644
--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -65205,7 +86548,7 @@ index 75e7b07f3e00..3d357294d83b 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65213,7 +86556,7 @@ index 75e7b07f3e00..3d357294d83b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -65254,6 +86597,7 @@ index 75e7b07f3e00..3d357294d83b 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -65288,10 +86632,6 @@ index 75e7b07f3e00..3d357294d83b 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
--
-- OS_LIBS += [
-- "winmm"
-- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -65309,6 +86649,24 @@ index 75e7b07f3e00..3d357294d83b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -65342,10 +86700,10 @@ index 75e7b07f3e00..3d357294d83b 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- OS_LIBS += [
- "android_support"
- ]
@@ -65359,35 +86717,40 @@ index 75e7b07f3e00..3d357294d83b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["CPU_ARCH"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- CXXFLAGS += [
- "-msse2"
- ]
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("metrics_gn")
diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-index e5363ed34740..7e7eaba535a3 100644
+index bfc6aa12f922..2c316fbc9e0f 100644
--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -65396,7 +86759,7 @@ index e5363ed34740..7e7eaba535a3 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,181 +53,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,200 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65404,7 +86767,7 @@ index e5363ed34740..7e7eaba535a3 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -65459,6 +86822,7 @@ index e5363ed34740..7e7eaba535a3 100644
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -65517,6 +86881,24 @@ index e5363ed34740..7e7eaba535a3 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -65549,8 +86931,7 @@ index e5363ed34740..7e7eaba535a3 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -65568,34 +86949,40 @@ index e5363ed34740..7e7eaba535a3 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
--
++if CONFIG["CPU_ARCH"] == "x86_64":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
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 137a0d97034a..7e85b073fc5e 100644
+index 25bb2ee0a16a..c15a9ae02722 100644
--- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
+++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -65604,7 +86991,7 @@ index 137a0d97034a..7e85b073fc5e 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65612,7 +86999,7 @@ index 137a0d97034a..7e85b073fc5e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -65623,7 +87010,6 @@ index 137a0d97034a..7e85b073fc5e 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "GLESv2",
- "log"
- ]
-
@@ -65652,13 +87038,13 @@ index 137a0d97034a..7e85b073fc5e 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -65709,14 +87095,26 @@ index 137a0d97034a..7e85b073fc5e 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
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -65738,9 +87136,10 @@ index 137a0d97034a..7e85b073fc5e 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 += [
@@ -65749,12 +87148,7 @@ index 137a0d97034a..7e85b073fc5e 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -65769,10 +87163,6 @@ index 137a0d97034a..7e85b073fc5e 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
@@ -65781,7 +87171,7 @@ index 137a0d97034a..7e85b073fc5e 100644
-
Library("rtp_test_utils_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
-index 5fe12561bce8..d2fa12edf11c 100644
+index 31acde4e32f6..a07cf094c60f 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -65789,14 +87179,14 @@ index 5fe12561bce8..d2fa12edf11c 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65804,7 +87194,7 @@ index 5fe12561bce8..d2fa12edf11c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -65827,6 +87217,7 @@ index 5fe12561bce8..d2fa12edf11c 100644
-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
@@ -65858,6 +87249,14 @@ index 5fe12561bce8..d2fa12edf11c 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -65879,9 +87278,10 @@ index 5fe12561bce8..d2fa12edf11c 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 += [
@@ -65913,7 +87313,7 @@ index 5fe12561bce8..d2fa12edf11c 100644
-
Library("algorithm_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
-index 630af3526021..18d9ccea5cef 100644
+index ca1f9f85bf02..ea98e82e69b0 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -65921,14 +87321,14 @@ index 630af3526021..18d9ccea5cef 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65936,7 +87336,7 @@ index 630af3526021..18d9ccea5cef 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -65959,6 +87359,7 @@ index 630af3526021..18d9ccea5cef 100644
-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
@@ -65990,6 +87391,14 @@ index 630af3526021..18d9ccea5cef 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66011,9 +87420,10 @@ index 630af3526021..18d9ccea5cef 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 += [
@@ -66045,7 +87455,7 @@ index 630af3526021..18d9ccea5cef 100644
-
Library("container_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
-index 5faed87779ac..f47c187eeb30 100644
+index 5b1e4a8e0ac3..49c783cd4c81 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -66053,14 +87463,14 @@ index 5faed87779ac..f47c187eeb30 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66068,7 +87478,7 @@ index 5faed87779ac..f47c187eeb30 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -66091,6 +87501,7 @@ index 5faed87779ac..f47c187eeb30 100644
-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
@@ -66122,6 +87533,14 @@ index 5faed87779ac..f47c187eeb30 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66143,9 +87562,10 @@ index 5faed87779ac..f47c187eeb30 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 += [
@@ -66177,7 +87597,7 @@ index 5faed87779ac..f47c187eeb30 100644
-
Library("atomic_hook_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
-index 039d5a2ca43d..3583851cc93c 100644
+index e21dd2812a91..ac7916a85e5d 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -66185,14 +87605,14 @@ index 039d5a2ca43d..3583851cc93c 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66200,7 +87620,7 @@ index 039d5a2ca43d..3583851cc93c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -66223,6 +87643,7 @@ index 039d5a2ca43d..3583851cc93c 100644
-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
@@ -66254,6 +87675,14 @@ index 039d5a2ca43d..3583851cc93c 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66275,9 +87704,10 @@ index 039d5a2ca43d..3583851cc93c 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 += [
@@ -66309,7 +87739,7 @@ index 039d5a2ca43d..3583851cc93c 100644
-
Library("base_internal_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
-index c1b4dec3de4d..d2251519a32f 100644
+index d226f5a9e03c..a1d553dad6db 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -66317,14 +87747,14 @@ index c1b4dec3de4d..d2251519a32f 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66332,7 +87762,7 @@ index c1b4dec3de4d..d2251519a32f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -66355,6 +87785,7 @@ index c1b4dec3de4d..d2251519a32f 100644
-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
@@ -66386,6 +87817,14 @@ index c1b4dec3de4d..d2251519a32f 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66407,9 +87846,10 @@ index c1b4dec3de4d..d2251519a32f 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 += [
@@ -66441,7 +87881,7 @@ index c1b4dec3de4d..d2251519a32f 100644
-
Library("config_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
-index 652e6a65967f..5a597d0edf3c 100644
+index 9bb661c458d7..3e445069597d 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -66449,14 +87889,14 @@ index 652e6a65967f..5a597d0edf3c 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66464,7 +87904,7 @@ index 652e6a65967f..5a597d0edf3c 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -66487,6 +87927,7 @@ index 652e6a65967f..5a597d0edf3c 100644
-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
@@ -66518,6 +87959,14 @@ index 652e6a65967f..5a597d0edf3c 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66539,9 +87988,10 @@ index 652e6a65967f..5a597d0edf3c 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 += [
@@ -66573,7 +88023,7 @@ index 652e6a65967f..5a597d0edf3c 100644
-
Library("core_headers_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
-index 8a106d7421e8..da843b39d995 100644
+index a237d04bb798..edd5959dc1b8 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -66581,14 +88031,14 @@ index 8a106d7421e8..da843b39d995 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66596,7 +88046,7 @@ index 8a106d7421e8..da843b39d995 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -66619,6 +88069,7 @@ index 8a106d7421e8..da843b39d995 100644
-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
@@ -66656,6 +88107,14 @@ index 8a106d7421e8..da843b39d995 100644
- "-mfpu=neon"
- ]
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66666,12 +88125,12 @@ index 8a106d7421e8..da843b39d995 100644
-
-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"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -66688,12 +88147,11 @@ index 8a106d7421e8..da843b39d995 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -66707,20 +88165,23 @@ index 8a106d7421e8..da843b39d995 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- 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["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("log_severity_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
-index 2445527602c9..4948630ceefc 100644
+index 8be2f4c300d7..f55dd72d008a 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -66728,14 +88189,14 @@ index 2445527602c9..4948630ceefc 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66743,7 +88204,7 @@ index 2445527602c9..4948630ceefc 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -66766,6 +88227,7 @@ index 2445527602c9..4948630ceefc 100644
-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
@@ -66803,6 +88265,14 @@ index 2445527602c9..4948630ceefc 100644
- "-mfpu=neon"
- ]
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66813,12 +88283,170 @@ index 2445527602c9..4948630ceefc 100644
-
-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"] == "OpenBSD":
+-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["_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":
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
+- 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["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("raw_logging_internal_gn")
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
+index 813eed764791..bc411d424827 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_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"
+
+@@ -36,138 +41,16 @@ 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["CPU_ARCH"] == "arm":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = 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"
@@ -66835,12 +88463,160 @@ index 2445527602c9..4948630ceefc 100644
- ]
-
-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["_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":
+if CONFIG["CPU_ARCH"] == "x86":
CXXFLAGS += [
"-msse2"
]
+- 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["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("throw_delegate_gn")
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
+index 6cd0d6b473dd..367c6bd433a3 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_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,124 +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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = 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"
- ]
@@ -66855,34 +88631,30 @@ index 2445527602c9..4948630ceefc 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("raw_logging_internal_gn")
-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
-index cd7fed08714c..000beff5cca4 100644
---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
+ Library("cleanup_gn")
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
+index b0fd90e5e1aa..3f4fc9ed0f88 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66890,7 +88662,7 @@ index cd7fed08714c..000beff5cca4 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -66913,6 +88685,7 @@ index cd7fed08714c..000beff5cca4 100644
-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
@@ -66944,6 +88717,14 @@ index cd7fed08714c..000beff5cca4 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -66965,9 +88746,10 @@ index cd7fed08714c..000beff5cca4 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 += [
@@ -66997,24 +88779,24 @@ index cd7fed08714c..000beff5cca4 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 c04bd9ad5d68..1c42939aaf6e 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
+ Library("cleanup_internal_gn")
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
+index 29587550a341..38403c4daf5f 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67022,7 +88804,7 @@ index c04bd9ad5d68..1c42939aaf6e 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67045,6 +88827,7 @@ index c04bd9ad5d68..1c42939aaf6e 100644
-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
@@ -67076,6 +88859,14 @@ index c04bd9ad5d68..1c42939aaf6e 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -67097,9 +88888,10 @@ index c04bd9ad5d68..1c42939aaf6e 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 += [
@@ -67129,9 +88921,9 @@ index c04bd9ad5d68..1c42939aaf6e 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("flat_hash_map_gn")
+ Library("compressed_tuple_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 36df98d790fa..a7693ca193ac 100644
+index 9cebdf041bf3..f3c3c2ec8183 100644
--- 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
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -67139,14 +88931,14 @@ index 36df98d790fa..a7693ca193ac 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67154,7 +88946,7 @@ index 36df98d790fa..a7693ca193ac 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67177,6 +88969,7 @@ index 36df98d790fa..a7693ca193ac 100644
-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
@@ -67208,6 +89001,14 @@ index 36df98d790fa..a7693ca193ac 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -67229,9 +89030,10 @@ index 36df98d790fa..a7693ca193ac 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 += [
@@ -67263,7 +89065,7 @@ index 36df98d790fa..a7693ca193ac 100644
-
Library("inlined_vector_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
-index b5f65b9c7324..48833b0dc3a7 100644
+index 6bd470bb56b8..b5c250da1c55 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -67271,14 +89073,156 @@ index b5f65b9c7324..48833b0dc3a7 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
+
+ FINAL_LIBRARY = "webrtc"
+
+@@ -32,124 +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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = 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("inlined_vector_internal_gn")
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
+index c71de94dba7d..8cc78181cb75 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_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"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67286,7 +89230,7 @@ index b5f65b9c7324..48833b0dc3a7 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67309,6 +89253,7 @@ index b5f65b9c7324..48833b0dc3a7 100644
-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
@@ -67340,6 +89285,14 @@ index b5f65b9c7324..48833b0dc3a7 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -67361,9 +89314,152 @@ index b5f65b9c7324..48833b0dc3a7 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("any_invocable_gn")
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
+index 6844d6e45b13..5c92f038c84f 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_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,124 +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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = 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 += [
@@ -67393,9 +89489,9 @@ index b5f65b9c7324..48833b0dc3a7 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("inlined_vector_internal_gn")
+ Library("bind_front_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
-index f0a2b489ba7b..8aab5de10d16 100644
+index 092f878b8e82..cf5df0d3048a 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -67403,14 +89499,14 @@ index f0a2b489ba7b..8aab5de10d16 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67418,7 +89514,7 @@ index f0a2b489ba7b..8aab5de10d16 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67441,6 +89537,7 @@ index f0a2b489ba7b..8aab5de10d16 100644
-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
@@ -67472,6 +89569,14 @@ index f0a2b489ba7b..8aab5de10d16 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -67493,9 +89598,10 @@ index f0a2b489ba7b..8aab5de10d16 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 += [
@@ -67527,7 +89633,7 @@ index f0a2b489ba7b..8aab5de10d16 100644
-
Library("memory_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
-index 6114f68114ee..c9a0811d6272 100644
+index ddb9d262175a..d7c6a3f7be95 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -67535,14 +89641,14 @@ index 6114f68114ee..c9a0811d6272 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67550,7 +89656,7 @@ index 6114f68114ee..c9a0811d6272 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67573,6 +89679,7 @@ index 6114f68114ee..c9a0811d6272 100644
-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
@@ -67604,6 +89711,14 @@ index 6114f68114ee..c9a0811d6272 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -67625,9 +89740,10 @@ index 6114f68114ee..c9a0811d6272 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 += [
@@ -67658,23 +89774,23 @@ index 6114f68114ee..c9a0811d6272 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("type_traits_gn")
-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
-index 69affa55af2e..4977717f4af0 100644
---- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
+index 9c8d37ad517d..09fa161e8735 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67682,7 +89798,7 @@ index 69affa55af2e..4977717f4af0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67705,6 +89821,7 @@ index 69affa55af2e..4977717f4af0 100644
-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
@@ -67736,11 +89853,13 @@ index 69affa55af2e..4977717f4af0 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
--if CONFIG["CPU_ARCH"] == "arm":
+-if CONFIG["CPU_ARCH"] == "mips32":
-
-- CXXFLAGS += [
-- "-mfpu=neon"
-- ]
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -67748,24 +89867,25 @@ index 69affa55af2e..4977717f4af0 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
-- DEFINES["_DEBUG"] = True
--
+ 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
-
+- 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -67774,12 +89894,7 @@ index 69affa55af2e..4977717f4af0 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -67794,34 +89909,30 @@ index 69affa55af2e..4977717f4af0 100644
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
-
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("int128_gn")
-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
-index 3742d55f8420..b4eba87aca14 100644
---- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
+ Library("bits_gn")
+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
+index a15b4f43bbe4..0e364e67c4fc 100644
+--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
++++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -37,129 +42,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67829,7 +89940,7 @@ index 3742d55f8420..b4eba87aca14 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67852,6 +89963,7 @@ index 3742d55f8420..b4eba87aca14 100644
-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
@@ -67889,6 +90001,14 @@ index 3742d55f8420..b4eba87aca14 100644
- "-mfpu=neon"
- ]
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -67899,12 +90019,12 @@ index 3742d55f8420..b4eba87aca14 100644
-
-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"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -67921,12 +90041,11 @@ index 3742d55f8420..b4eba87aca14 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -67940,20 +90059,23 @@ index 3742d55f8420..b4eba87aca14 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- 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["_GNU_SOURCE"] = True
--
- Library("internal_gn")
++ DEFINES["USE_X11"] = "1"
+
+ Library("int128_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
-index c0b3ff9df0b9..8b091bdbc78f 100644
+index 2a53b9e647f7..71fd3a4a576d 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -67961,14 +90083,14 @@ index c0b3ff9df0b9..8b091bdbc78f 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -50,129 +55,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,138 +45,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67976,7 +90098,7 @@ index c0b3ff9df0b9..8b091bdbc78f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -67999,6 +90121,7 @@ index c0b3ff9df0b9..8b091bdbc78f 100644
-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
@@ -68036,18 +90159,26 @@ index c0b3ff9df0b9..8b091bdbc78f 100644
- "-mfpu=neon"
- ]
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = 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"] == "Linux":
+-
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
@@ -68095,12 +90226,14 @@ index c0b3ff9df0b9..8b091bdbc78f 100644
- 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["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("strings_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
-index 2bd4896cfc2c..df99b3dba347 100644
+index 3a88a0da486e..54aba92be8f6 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -68108,14 +90241,14 @@ index 2bd4896cfc2c..df99b3dba347 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68123,7 +90256,7 @@ index 2bd4896cfc2c..df99b3dba347 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -68146,6 +90279,7 @@ index 2bd4896cfc2c..df99b3dba347 100644
-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
@@ -68183,6 +90317,14 @@ index 2bd4896cfc2c..df99b3dba347 100644
- "-mfpu=neon"
- ]
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -68193,12 +90335,12 @@ index 2bd4896cfc2c..df99b3dba347 100644
-
-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"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -68215,12 +90357,11 @@ index 2bd4896cfc2c..df99b3dba347 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -68234,20 +90375,23 @@ index 2bd4896cfc2c..df99b3dba347 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- 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["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("bad_optional_access_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
-index 349a94d61f55..9189b1a5f0c2 100644
+index 08cc9180d644..edc6c3091d3e 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -68255,14 +90399,14 @@ index 349a94d61f55..9189b1a5f0c2 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -35,129 +40,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68270,7 +90414,7 @@ index 349a94d61f55..9189b1a5f0c2 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -68293,6 +90437,7 @@ index 349a94d61f55..9189b1a5f0c2 100644
-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
@@ -68330,6 +90475,14 @@ index 349a94d61f55..9189b1a5f0c2 100644
- "-mfpu=neon"
- ]
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -68340,12 +90493,12 @@ index 349a94d61f55..9189b1a5f0c2 100644
-
-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"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
@@ -68362,12 +90515,11 @@ index 349a94d61f55..9189b1a5f0c2 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
+-
+- CXXFLAGS += [
+- "-msse2"
+- ]
+-
- OS_LIBS += [
- "android_support"
- ]
@@ -68381,20 +90533,23 @@ index 349a94d61f55..9189b1a5f0c2 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
-- CXXFLAGS += [
-- "-msse2"
-- ]
--
++if CONFIG["CPU_ARCH"] == "x86":
+
+ CXXFLAGS += [
+ "-msse2"
+ ]
+
- 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["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("bad_variant_access_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
-index 3d21756a392e..3dd5e187cdab 100644
+index 96113b00bd5d..f68149f85c45 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -68402,14 +90557,14 @@ index 3d21756a392e..3dd5e187cdab 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68417,7 +90572,7 @@ index 3d21756a392e..3dd5e187cdab 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -68440,6 +90595,7 @@ index 3d21756a392e..3dd5e187cdab 100644
-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
@@ -68471,6 +90627,14 @@ index 3d21756a392e..3dd5e187cdab 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -68492,9 +90656,10 @@ index 3d21756a392e..3dd5e187cdab 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 += [
@@ -68526,7 +90691,7 @@ index 3d21756a392e..3dd5e187cdab 100644
-
Library("optional_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
-index 959c548b476d..4ea5fe663e36 100644
+index 31e83327e0d0..293b2b62e2e5 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -68534,14 +90699,14 @@ index 959c548b476d..4ea5fe663e36 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68549,7 +90714,7 @@ index 959c548b476d..4ea5fe663e36 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -68572,6 +90737,7 @@ index 959c548b476d..4ea5fe663e36 100644
-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
@@ -68603,6 +90769,14 @@ index 959c548b476d..4ea5fe663e36 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -68624,9 +90798,10 @@ index 959c548b476d..4ea5fe663e36 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 += [
@@ -68658,7 +90833,7 @@ index 959c548b476d..4ea5fe663e36 100644
-
Library("span_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
-index b11a71fd0c62..6c74f9f8cb50 100644
+index 90e8e3b9d115..59ea6584a0f4 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -68666,14 +90841,14 @@ index b11a71fd0c62..6c74f9f8cb50 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68681,7 +90856,7 @@ index b11a71fd0c62..6c74f9f8cb50 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -68704,6 +90879,7 @@ index b11a71fd0c62..6c74f9f8cb50 100644
-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
@@ -68735,6 +90911,14 @@ index b11a71fd0c62..6c74f9f8cb50 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -68756,9 +90940,10 @@ index b11a71fd0c62..6c74f9f8cb50 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 += [
@@ -68790,7 +90975,7 @@ index b11a71fd0c62..6c74f9f8cb50 100644
-
Library("variant_gn")
diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
-index 5e5dbc641bfe..0482732d1b92 100644
+index 180c8a2fbbf7..c06e16fa60f4 100644
--- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
+++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -68798,14 +90983,14 @@ index 5e5dbc641bfe..0482732d1b92 100644
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
FINAL_LIBRARY = "webrtc"
-@@ -31,115 +36,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68813,7 +90998,7 @@ index 5e5dbc641bfe..0482732d1b92 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
-
@@ -68836,6 +91021,7 @@ index 5e5dbc641bfe..0482732d1b92 100644
-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
@@ -68867,6 +91053,14 @@ index 5e5dbc641bfe..0482732d1b92 100644
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -68888,9 +91082,478 @@ index 5e5dbc641bfe..0482732d1b92 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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("utility_gn")
+diff --git third_party/libwebrtc/third_party/drm/drm_gn/moz.build third_party/libwebrtc/third_party/drm/drm_gn/moz.build
+deleted file mode 100644
+index 78ba6b526064..000000000000
+--- third_party/libwebrtc/third_party/drm/drm_gn/moz.build
++++ /dev/null
+@@ -1,88 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["USE_AURA"] = "1"
+-DEFINES["USE_GLIB"] = "1"
+-DEFINES["USE_NSS_CERTS"] = "1"
+-DEFINES["USE_OZONE"] = "1"
+-DEFINES["USE_UDEV"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["_FILE_OFFSET_BITS"] = "64"
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["_LARGEFILE64_SOURCE"] = True
+-DEFINES["_LARGEFILE_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/drm/drm/",
+- "/third_party/drm/drm/include/",
+- "/third_party/drm/drm/include/libdrm/",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["MIPS32_LE"] = True
+- DEFINES["MIPS_FPU_LE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("drm_gn")
+diff --git third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
+deleted file mode 100644
+index 173399cf13bd..000000000000
+--- third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
++++ /dev/null
+@@ -1,86 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["USE_AURA"] = "1"
+-DEFINES["USE_GLIB"] = "1"
+-DEFINES["USE_NSS_CERTS"] = "1"
+-DEFINES["USE_OZONE"] = "1"
+-DEFINES["USE_UDEV"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["_FILE_OFFSET_BITS"] = "64"
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["_LARGEFILE64_SOURCE"] = True
+-DEFINES["_LARGEFILE_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/gbm/gbm/",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["MIPS32_LE"] = True
+- DEFINES["MIPS_FPU_LE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("gbm_gn")
+diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
+deleted file mode 100644
+index 646e12d72d60..000000000000
+--- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
++++ /dev/null
+@@ -1,87 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["USE_AURA"] = "1"
+-DEFINES["USE_GLIB"] = "1"
+-DEFINES["USE_NSS_CERTS"] = "1"
+-DEFINES["USE_OZONE"] = "1"
+-DEFINES["USE_UDEV"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["_FILE_OFFSET_BITS"] = "64"
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["_LARGEFILE64_SOURCE"] = True
+-DEFINES["_LARGEFILE_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/gfx/angle/checkout/include/",
+- "/ipc/chromium/src",
+- "/third_party/libepoxy/libepoxy/include/",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["MIPS32_LE"] = True
+- DEFINES["MIPS_FPU_LE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("epoxy_gn")
+diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+index 2d97f962e7f9..dcece6e53f93 100644
+--- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
++++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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"
+
+@@ -41,103 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_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_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -147,57 +70,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -68920,9 +91583,9 @@ index 5e5dbc641bfe..0482732d1b92 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("utility_gn")
+ Library("yuv_gn")
diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-index 9f368c5bea1c..4dca3a9a25ed 100644
+index 27095596f717..5394d07cc759 100644
--- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
+++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
@@ -9,6 +9,14 @@
@@ -68930,7 +91593,7 @@ index 9f368c5bea1c..4dca3a9a25ed 100644
AllowCompilerWarnings()
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -68940,7 +91603,7 @@ index 9f368c5bea1c..4dca3a9a25ed 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,140 +40,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -33,151 +41,28 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68948,7 +91611,7 @@ index 9f368c5bea1c..4dca3a9a25ed 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -68977,6 +91640,7 @@ index 9f368c5bea1c..4dca3a9a25ed 100644
-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
@@ -69016,6 +91680,16 @@ index 9f368c5bea1c..4dca3a9a25ed 100644
- ]
+ DEFINES["_DEBUG"] = True
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["PFFFT_SIMD_DISABLE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "mips64":
+
+ DEFINES["PFFFT_SIMD_DISABLE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+
if CONFIG["CPU_ARCH"] == "ppc64":
DEFINES["PFFFT_SIMD_DISABLE"] = True
@@ -69063,7 +91737,8 @@ index 9f368c5bea1c..4dca3a9a25ed 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
@@ -69081,10 +91756,104 @@ index 9f368c5bea1c..4dca3a9a25ed 100644
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
--
++ DEFINES["USE_X11"] = "1"
+
Library("pffft_gn")
+diff --git third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
+deleted file mode 100644
+index 86a0daf8fa51..000000000000
+--- third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
++++ /dev/null
+@@ -1,87 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["USE_AURA"] = "1"
+-DEFINES["USE_GLIB"] = "1"
+-DEFINES["USE_NSS_CERTS"] = "1"
+-DEFINES["USE_OZONE"] = "1"
+-DEFINES["USE_UDEV"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-DEFINES["_FILE_OFFSET_BITS"] = "64"
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["_LARGEFILE64_SOURCE"] = True
+-DEFINES["_LARGEFILE_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/third_party/pipewire/",
+- "/tools/profiler/public"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["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["CPU_ARCH"] == "mips32":
+-
+- DEFINES["MIPS32_LE"] = True
+- DEFINES["MIPS_FPU_LE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("pipewire_gn")
diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-index 4d82cbfa21a5..fa28ac0809ac 100644
+index 2a3db9a62207..087012313675 100644
--- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
+++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
@@ -9,6 +9,14 @@
@@ -69092,7 +91861,7 @@ index 4d82cbfa21a5..fa28ac0809ac 100644
AllowCompilerWarnings()
+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -69102,7 +91871,7 @@ index 4d82cbfa21a5..fa28ac0809ac 100644
FINAL_LIBRARY = "webrtc"
-@@ -32,135 +40,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -33,144 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69110,7 +91879,7 @@ index 4d82cbfa21a5..fa28ac0809ac 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
@@ -69139,6 +91908,7 @@ index 4d82cbfa21a5..fa28ac0809ac 100644
-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
@@ -69176,6 +91946,14 @@ index 4d82cbfa21a5..fa28ac0809ac 100644
- "-mfpu=neon"
- ]
-
+-if CONFIG["CPU_ARCH"] == "mips32":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -69208,12 +91986,231 @@ index 4d82cbfa21a5..fa28ac0809ac 100644
- ]
-
-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["_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":
+if CONFIG["CPU_ARCH"] == "x86":
CXXFLAGS += [
"-msse2"
]
+- 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["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 e0f103cc6cbd..c019774c6343 100644
+--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
++++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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"
+
+@@ -52,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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"
- ]
@@ -69227,34 +92224,255 @@ index 4d82cbfa21a5..fa28ac0809ac 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("video_adaptation_gn")
+diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+index ea2b54bfb866..2dc027987bb6 100644
+--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
++++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- Library("rnn_vad_gn")
-diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-index d4504c740c91..dc3a7b245367 100644
---- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 9e174cff3ccb..3ab1b0d83805 100644
+--- third_party/libwebrtc/video/config/streams_config_gn/moz.build
++++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -69263,7 +92481,7 @@ index d4504c740c91..dc3a7b245367 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,173 +56,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69271,7 +92489,7 @@ index d4504c740c91..dc3a7b245367 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -69311,13 +92529,13 @@ index d4504c740c91..dc3a7b245367 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -69376,6 +92594,24 @@ index d4504c740c91..dc3a7b245367 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -69408,8 +92644,229 @@ index d4504c740c91..dc3a7b245367 100644
- ]
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("streams_config_gn")
+diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
+index de01a944eadc..f306e996bb22 100644
+--- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
++++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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"
]
@@ -69427,10 +92884,441 @@ index d4504c740c91..dc3a7b245367 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("decode_synchronizer_gn")
+diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
+index 2f7abf4617c9..f0eff3beb31c 100644
+--- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
++++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
-
- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("frame_cadence_adapter_gn")
+diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
+index 834d9880e79f..b37ca42dd139 100644
+--- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
++++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -69438,23 +93326,246 @@ index d4504c740c91..dc3a7b245367 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_adaptation_gn")
+ Library("frame_decode_scheduler_gn")
+diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
+index 570b927d3a81..40d9a4ffcc46 100644
+--- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
++++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 addd74837347..49f1746c0a7f 100644
+index 3266e8f07fbf..254d05acd491 100644
--- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
+++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -69463,7 +93574,7 @@ index addd74837347..49f1746c0a7f 100644
FINAL_LIBRARY = "webrtc"
-@@ -40,173 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69471,7 +93582,7 @@ index addd74837347..49f1746c0a7f 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -69511,13 +93622,13 @@ index addd74837347..49f1746c0a7f 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -69576,6 +93687,24 @@ index addd74837347..49f1746c0a7f 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -69608,8 +93737,222 @@ index addd74837347..49f1746c0a7f 100644
- ]
-
-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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("frame_dumping_decoder_gn")
+diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
+index c8b8614b0499..42958c3afcef 100644
+--- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
++++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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"
]
@@ -69627,34 +93970,684 @@ index addd74837347..49f1746c0a7f 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("incoming_video_stream_gn")
+diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
+index 951c654ef6d2..a3b28f438f5d 100644
+--- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
++++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("video_render_frames_gn")
+diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
+index e9e33818dec5..f8bc9184d923 100644
+--- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
++++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("task_queue_frame_decode_scheduler_gn")
+diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
+index de254b0f678e..177b8617949e 100644
+--- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
++++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- Library("frame_dumping_decoder_gn")
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("unique_timestamp_counter_gn")
diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
-index 32f507080486..22d44997d00b 100644
+index a0f2d5b6ef84..542c0c791108 100644
--- third_party/libwebrtc/video/video_gn/moz.build
+++ third_party/libwebrtc/video/video_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -69663,7 +94656,7 @@ index 32f507080486..22d44997d00b 100644
FINAL_LIBRARY = "webrtc"
-@@ -69,173 +78,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -65,191 +74,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69671,7 +94664,7 @@ index 32f507080486..22d44997d00b 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -69711,13 +94704,13 @@ index 32f507080486..22d44997d00b 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -69776,6 +94769,24 @@ index 32f507080486..22d44997d00b 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -69808,8 +94819,7 @@ index 32f507080486..22d44997d00b 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -69827,34 +94837,485 @@ index 32f507080486..22d44997d00b 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("video_gn")
+diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
+index 0de224d0dfb5..b74708587cec 100644
+--- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
++++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 a18b990a8d75..8b1e03633a54 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,20 @@ 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_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,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- Library("video_gn")
+- OS_LIBS += [
+- "GLESv2",
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["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["_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["WEBRTC_ENABLE_AVX2"] = True
+
+- CXXFLAGS += [
+- "-msse2"
+- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ 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 a4e180638985..34ee6fde3742 100644
+index cd70bcde35e5..004e04207c71 100644
--- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -69863,7 +95324,7 @@ index a4e180638985..34ee6fde3742 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +54,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69871,7 +95332,7 @@ index a4e180638985..34ee6fde3742 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -69911,13 +95372,13 @@ index a4e180638985..34ee6fde3742 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -69976,6 +95437,24 @@ index a4e180638985..34ee6fde3742 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -70008,8 +95487,7 @@ index a4e180638985..34ee6fde3742 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
-
+-
CXXFLAGS += [
"-msse2"
]
@@ -70027,10 +95505,212 @@ index a4e180638985..34ee6fde3742 100644
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
++if CONFIG["CPU_ARCH"] == "x86_64":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+- DEFINES["_GNU_SOURCE"] = True
++ DEFINES["USE_X11"] = "1"
+
+ Library("video_stream_encoder_impl_gn")
+diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
+index e058513d4fb8..d51109a08c5f 100644
+--- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
++++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
+@@ -12,11 +12,20 @@ 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_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,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+
+ DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+- DEFINES["WEBRTC_LINUX"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_GNU_SOURCE"] = True
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+- OS_LIBS += [
+- "log"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["WEBRTC_MAC"] = True
+- DEFINES["WEBRTC_POSIX"] = True
+- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+- DEFINES["__STDC_CONSTANT_MACROS"] = True
+- DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["WEBRTC_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_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_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":
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "mips64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["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
-
@@ -70038,23 +95718,24 @@ index a4e180638985..34ee6fde3742 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
- Library("video_stream_encoder_impl_gn")
+ Library("video_stream_encoder_interface_gn")
diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index f1195473488c..96a21b5e9fd0 100644
+index d06327372572..de606adc2f95 100644
--- third_party/libwebrtc/webrtc_gn/moz.build
+++ third_party/libwebrtc/webrtc_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
-
+@@ -12,11 +12,20 @@ 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_X11"] = "1"
++DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = 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
@@ -70063,25 +95744,7 @@ index f1195473488c..96a21b5e9fd0 100644
FINAL_LIBRARY = "webrtc"
-@@ -27,6 +36,17 @@ LOCAL_INCLUDES += [
- "/tools/profiler/public"
- ]
-
-+OS_LIBS += [
-+ "X11",
-+ "Xcomposite",
-+ "Xdamage",
-+ "Xext",
-+ "Xfixes",
-+ "Xrandr",
-+ "Xrender",
-+ "Xtst"
-+]
-+
- if not CONFIG["MOZ_DEBUG"]:
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -36,207 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,141 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70089,7 +95752,7 @@ index f1195473488c..96a21b5e9fd0 100644
-if CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["ANDROID"] = True
-- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
@@ -70113,6 +95776,11 @@ index f1195473488c..96a21b5e9fd0 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- LOCAL_INCLUDES += [
+- "/third_party/libwebrtc/sdk/objc/",
+- "/third_party/libwebrtc/sdk/objc/base/"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["USE_AURA"] = "1"
@@ -70129,13 +95797,13 @@ index f1195473488c..96a21b5e9fd0 100644
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
-- "dl",
- "rt"
- ]
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
@@ -70207,12 +95875,22 @@ index f1195473488c..96a21b5e9fd0 100644
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["CPU_ARCH"] == "ppc64":
+ if CONFIG["CPU_ARCH"] == "mips32":
+
+ DEFINES["MIPS32_LE"] = True
+ DEFINES["MIPS_FPU_LE"] = True
+- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
+-if CONFIG["CPU_ARCH"] == "mips64":
-
+- DEFINES["_GNU_SOURCE"] = True
+
+ if CONFIG["CPU_ARCH"] == "x86":
+
+@@ -183,27 +68,7 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
@@ -70234,20 +95912,14 @@ index f1195473488c..96a21b5e9fd0 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+@@ -218,33 +83,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+ "Xtst"
+ ]
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -70265,10 +95937,6 @@ index f1195473488c..96a21b5e9fd0 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
@@ -70277,16 +95945,8 @@ index f1195473488c..96a21b5e9fd0 100644
-
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_GNU_SOURCE"] = True
-
-- OS_LIBS += [
-- "m"
-- ]
--
Library("webrtc_gn")
diff --git a/www/firefox-esr/files/patch-modules_fdlibm_src_math__private.h b/www/firefox-esr/files/patch-modules_fdlibm_src_math__private.h
new file mode 100644
index 000000000000..8d893f31e87c
--- /dev/null
+++ b/www/firefox-esr/files/patch-modules_fdlibm_src_math__private.h
@@ -0,0 +1,27 @@
+commit 7a20fbf537ee0867244109d1ea48a8ad9de2e4ea
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+
+ align typedefs with our libm for historical CPUs
+
+diff --git modules/fdlibm/src/math_private.h modules/fdlibm/src/math_private.h
+index f4373f27834a..3b898241660f 100644
+--- modules/fdlibm/src/math_private.h
++++ modules/fdlibm/src/math_private.h
+@@ -30,9 +30,17 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
++#ifdef __LP64__
+ typedef double __double_t;
++#else
++typedef long double __double_t;
++#endif
+ typedef __double_t double_t;
++#ifdef __LP64__
+ typedef float __float_t;
++#else
++typedef long double __float_t;
++#endif
+
+ /*
+ * The original fdlibm code used statements like:
diff --git a/www/firefox-esr/files/patch-pipewire_init b/www/firefox-esr/files/patch-pipewire_init
index 6673f942d028..04cd4c495cc3 100644
--- a/www/firefox-esr/files/patch-pipewire_init
+++ b/www/firefox-esr/files/patch-pipewire_init
@@ -1,35 +1,48 @@
-Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init
+ Chase ABI from multimedia/pipewire/files/patch-src_pipewire_pipewire_init
+
+ Ref: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1819
-
-diff --git third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-index 2fd3b1a575..79a14d7d7e 100644
---- third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-+++ third_party/libwebrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -279,7 +279,7 @@ void BaseCapturerPipeWire::InitPipeWire() {
- }
- #endif // defined(WEBRTC_DLOPEN_PIPEWIRE)
+diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+index 49b64845100b..283c387db770 100644
+--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+@@ -402,7 +402,7 @@ bool SharedScreenCastStreamPrivate::StartScreenCastStream(
+
+ pw_stream_node_id_ = stream_node_id;
- pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
+ pipewire_init(/*argc=*/nullptr, /*argc=*/nullptr);
pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
- pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
-diff --git third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs
-index 3e21e9dc07..f561dcf619 100644
---- third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs
-+++ third_party/libwebrtc/modules/desktop_capture/linux/pipewire.sigs
-@@ -16,7 +16,7 @@ void pw_loop_destroy(pw_loop *loop);
- pw_loop * pw_loop_new(pw_properties *properties);
+
+diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc
+index 3b829959aca8..9bdcdf1ffd51 100644
+--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc
++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/test/test_screencast_stream_provider.cc
+@@ -36,7 +36,7 @@ TestScreenCastStreamProvider::TestScreenCastStreamProvider(Observer* observer,
+ return;
+ }
+
+- pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
++ pipewire_init(/*argc=*/nullptr, /*argc=*/nullptr);
+
+ pw_main_loop_ = pw_thread_loop_new("pipewire-test-main-loop", nullptr);
+
+diff --git third_party/libwebrtc/modules/portal/pipewire.sigs third_party/libwebrtc/modules/portal/pipewire.sigs
+index 139a8c37a551..9fe131d8daa6 100644
+--- third_party/libwebrtc/modules/portal/pipewire.sigs
++++ third_party/libwebrtc/modules/portal/pipewire.sigs
+@@ -15,7 +15,7 @@ pw_loop * pw_loop_new(const spa_dict *props);
+
// pipewire.h
-void pw_init(int *argc, char **argv[]);
+void pipewire_init(int *argc, char **argv[]);
+ const char* pw_get_library_version();
// properties.h
- pw_properties * pw_properties_new_string(const char *args);
diff --git third_party/pipewire/libpipewire/mozpipewire.cpp third_party/pipewire/libpipewire/mozpipewire.cpp
-index 1ecfc3196a..6f44b35964 100644
+index fbeeb8e5a760..46f768790946 100644
--- third_party/pipewire/libpipewire/mozpipewire.cpp
+++ third_party/pipewire/libpipewire/mozpipewire.cpp
@@ -58,7 +58,7 @@ struct pw_context * (*pw_context_new_fn)(struct pw_loop *main_loop,
@@ -41,7 +54,7 @@ index 1ecfc3196a..6f44b35964 100644
static void (*pw_stream_add_listener_fn)(struct pw_stream *stream,
struct spa_hook *listener,
const struct pw_stream_events *events,
-@@ -96,7 +96,7 @@ bool IsPwLibraryLoaded() {
+@@ -101,7 +101,7 @@ bool IsPwLibraryLoaded() {
IS_FUNC_LOADED(pw_context_destroy_fn) &&
IS_FUNC_LOADED(pw_context_new_fn) &&
IS_FUNC_LOADED(pw_core_disconnect_fn) &&
@@ -49,8 +62,8 @@ index 1ecfc3196a..6f44b35964 100644
+ IS_FUNC_LOADED(pipewire_init_fn) &&
IS_FUNC_LOADED(pw_stream_add_listener_fn) &&
IS_FUNC_LOADED(pw_stream_connect_fn) &&
- IS_FUNC_LOADED(pw_stream_dequeue_buffer_fn) &&
-@@ -133,7 +133,7 @@ bool LoadPWLibrary() {
+ IS_FUNC_LOADED(pw_stream_disconnect_fn) &&
+@@ -142,7 +142,7 @@ bool LoadPWLibrary() {
GET_FUNC(pw_context_destroy, pwLib);
GET_FUNC(pw_context_new, pwLib);
GET_FUNC(pw_core_disconnect, pwLib);
@@ -58,8 +71,8 @@ index 1ecfc3196a..6f44b35964 100644
+ GET_FUNC(pipewire_init, pwLib);
GET_FUNC(pw_stream_add_listener, pwLib);
GET_FUNC(pw_stream_connect, pwLib);
- GET_FUNC(pw_stream_dequeue_buffer, pwLib);
-@@ -207,12 +207,12 @@ pw_core_disconnect(struct pw_core *core)
+ GET_FUNC(pw_stream_disconnect, pwLib);
+@@ -220,12 +220,12 @@ pw_core_disconnect(struct pw_core *core)
}
void
@@ -75,11 +88,11 @@ index 1ecfc3196a..6f44b35964 100644
void
diff --git third_party/pipewire/pipewire/pipewire.h third_party/pipewire/pipewire/pipewire.h
-index 69c523bd62..378502004c 100644
+index b932103f46e6..2c88e28421ec 100644
--- third_party/pipewire/pipewire/pipewire.h
+++ third_party/pipewire/pipewire/pipewire.h
-@@ -114,9 +114,9 @@ extern "C" {
- * \brief PipeWire initialization and infrastructure functions
+@@ -69,9 +69,9 @@ extern "C" {
+ * \{
*/
void
-pw_init(int *argc, char **argv[]);
diff --git a/www/firefox-esr/files/patch-python_mozbuild_mozbuild_gn__processor.py b/www/firefox-esr/files/patch-python_mozbuild_mozbuild_gn__processor.py
new file mode 100644
index 000000000000..3d887a12c66f
--- /dev/null
+++ b/www/firefox-esr/files/patch-python_mozbuild_mozbuild_gn__processor.py
@@ -0,0 +1,48 @@
+commit 0c96c599752d8d8f68b5ed8a6344888d1b505773
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+
+ fixup gn_processor.py for FreeBSD
+
+diff --git python/mozbuild/mozbuild/gn_processor.py python/mozbuild/mozbuild/gn_processor.py
+index b6c51ee010a8..15b4bda9df6e 100644
+--- python/mozbuild/mozbuild/gn_processor.py
++++ python/mozbuild/mozbuild/gn_processor.py
+@@ -185,6 +185,7 @@ def filter_gn_config(path, gn_result, sandbox_vars, input_vars, gn_target):
+ }
+ oses = {
+ "android": "Android",
++ "freebsd": "FreeBSD",
+ "linux": "Linux",
+ "mac": "Darwin",
+ "openbsd": "OpenBSD",
+@@ -735,16 +736,16 @@ def main():
+
+ vars_set = []
+ for is_debug in (True, False):
+- for target_os in ("android", "linux", "mac", "openbsd", "win"):
++ for target_os in ("freebsd",):
+ target_cpus = ["x64"]
+- if target_os in ("android", "linux", "mac", "win", "openbsd"):
++ if target_os in ("android", "freebsd", "linux", "mac", "win", "openbsd"):
+ target_cpus.append("arm64")
+ if target_os in ("android", "linux"):
+ target_cpus.append("arm")
+- if target_os in ("android", "linux", "win"):
++ if target_os in ("android", "freebsd", "linux", "win"):
+ target_cpus.append("x86")
+- if target_os == "linux":
+- target_cpus.extend(["ppc64", "riscv64", "mipsel", "mips64el"])
++ if target_os in ("freebsd", "linux"):
++ target_cpus.extend(["ppc64", "mipsel", "mips64el"])
+ for target_cpu in target_cpus:
+ vars = {
+ "host_cpu": "x64",
+@@ -752,7 +753,7 @@ def main():
+ "target_cpu": target_cpu,
+ "target_os": target_os,
+ }
+- if target_os == "linux":
++ if target_os in ("freebsd", "linux"):
+ for use_x11 in (True, False):
+ vars["use_x11"] = use_x11
+ vars_set.append(vars.copy())
diff --git a/www/firefox-esr/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn b/www/firefox-esr/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn
index b8dd40f4eb8a..c865374a24e2 100644
--- a/www/firefox-esr/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn
+++ b/www/firefox-esr/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn
@@ -1,42 +1,37 @@
---- ./third_party/libwebrtc/build/config/BUILDCONFIG.gn.orig 2022-07-16 22:08:55.347215000 +0200
-+++ ./third_party/libwebrtc/build/config/BUILDCONFIG.gn 2022-07-16 22:21:04.528041000 +0200
-@@ -131,10 +131,10 @@
- is_official_build = false
-
- # Whether we're a traditional desktop unix.
-- is_desktop_linux = current_os == "linux" || current_os == "openbsd"
-+ is_desktop_linux = current_os == "freebsd" || current_os == "linux" || current_os == "openbsd"
+--- third_party/libwebrtc/build/config/BUILDCONFIG.gn.orig 2022-10-09 20:42:58.113963000 +0200
++++ third_party/libwebrtc/build/config/BUILDCONFIG.gn 2022-10-09 20:46:16.128220000 +0200
+@@ -132,6 +132,7 @@
# Set to true when compiling with the Clang compiler.
-- is_clang = current_os != "linux" || current_os == "openbsd" ||
-+ is_clang = current_os != "linux" || current_os == "freebsd" || current_os == "openbsd" ||
+ is_clang = current_os != "linux" || current_os == "openbsd" ||
++ current_os == "freebsd" ||
(current_cpu != "s390x" && current_cpu != "s390" &&
current_cpu != "ppc64" && current_cpu != "ppc" &&
- current_cpu != "mips" && current_cpu != "mips64")
-@@ -186,7 +186,7 @@
+ current_cpu != "mips" && current_cpu != "mips64" &&
+@@ -184,7 +185,7 @@
# TODO(dpranke): Add some sort of assert here that verifies that
# no toolchain omitted host_toolchain from its toolchain_args().
- if (host_os == "linux" || host_os == "openbsd") {
-+ if (host_os == "freebsd" || host_os == "linux" || host_os == "openbsd") {
++ if (host_os == "linux" || host_os == "openbsd" || host_os == "freebsd") {
if (target_os != "linux") {
host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
} else if (is_clang) {
-@@ -224,7 +224,7 @@
+@@ -222,7 +223,7 @@
assert(host_os == "linux" || host_os == "mac",
"Android builds are only supported on Linux and Mac hosts.")
_default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
-} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") {
-+} else if (target_os == "chromeos" || target_os == "freebsd" || target_os == "linux" || target_os == "openbsd") {
++} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd" || target_os == "freebsd") {
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
if (is_clang) {
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -289,7 +289,7 @@
+@@ -288,7 +289,7 @@
is_fuchsia = current_os == "fuchsia"
is_ios = current_os == "ios"
- is_linux = current_os == "chromeos" || current_os == "linux"
+ is_linux = current_os == "linux"
-is_bsd = current_os == "openbsd"
-+is_bsd = current_os == "freebsd" || current_os == "openbsd"
++is_bsd = current_os == "openbsd" || current_os == "freebsd"
is_mac = current_os == "mac"
is_nacl = current_os == "nacl"
is_win = current_os == "win" || current_os == "winuwp"
diff --git a/www/firefox-esr/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc b/www/firefox-esr/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc
new file mode 100644
index 000000000000..5af9e7ec2d70
--- /dev/null
+++ b/www/firefox-esr/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc
@@ -0,0 +1,23 @@
+commit d1f5a45c1906e9f1e6a51f3b44c52d981bb3958c
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+Date: Wed Oct 12 19:57:20 2022 +0200
+
+ pull in sys/types.h for u_XXX typedefs on FreeBSD 12
+
+ In file included from /wrkdirs/usr/ports/www/firefox/work/firefox-106.0/third_party/libwebrtc/rtc_base/ip_address.cc:20:
+ /usr/include/netinet/ip.h:53:2: error: unknown type name 'u_char'; did you mean 'char'?
+ u_char ip_hl:4, /* header length */
+
+diff --git third_party/libwebrtc/rtc_base/ip_address.cc third_party/libwebrtc/rtc_base/ip_address.cc
+index d544b611e149..ef9b742dac5f 100644
+--- third_party/libwebrtc/rtc_base/ip_address.cc
++++ third_party/libwebrtc/rtc_base/ip_address.cc
+@@ -11,6 +11,8 @@
+ #if defined(WEBRTC_POSIX)
+ #include <netinet/in.h>
+ #include <sys/socket.h>
++/* for u_char/u_short etc on FreeBSD 12 */
++#include <sys/types.h>
+
+ #include "absl/strings/string_view.h"
+ #ifdef OPENBSD
diff --git a/www/firefox-esr/files/patch-toolkit_xre_glxtest.cpp b/www/firefox-esr/files/patch-toolkit_xre_glxtest.cpp
new file mode 100644
index 000000000000..a054f2032cd2
--- /dev/null
+++ b/www/firefox-esr/files/patch-toolkit_xre_glxtest.cpp
@@ -0,0 +1,17 @@
+--- toolkit/xre/glxtest/glxtest.cpp.orig 2023-05-28 22:08:21.663847000 +0200
++++ toolkit/xre/glxtest/glxtest.cpp 2023-05-28 22:09:33.647075000 +0200
+@@ -195,9 +195,14 @@
+ static void get_pci_status() {
+ log("GLX_TEST: get_pci_status start\n");
+
++#if defined(__FreeBSD__)
++ if (access("/dev/pci", F_OK) != 0) {
++ record_warning("cannot access /dev/pci");
++#else
+ if (access("/sys/bus/pci/", F_OK) != 0 &&
+ access("/sys/bus/pci_express/", F_OK) != 0) {
+ record_warning("cannot access /sys/bus/pci");
++#endif
+ return;
+ }
+