aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2023-09-26 19:14:51 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2023-09-26 19:14:51 +0000
commitafcc7e8a7365f9378d6ce30d41fdc41c818f8f17 (patch)
tree725562c940f0978fc54d32448a22981e245eb3dc
parentb0cefa75d43d9731c76d28da34cea99b68c7fe50 (diff)
downloadports-afcc7e8a7365f9378d6ce30d41fdc41c818f8f17.tar.gz
ports-afcc7e8a7365f9378d6ce30d41fdc41c818f8f17.zip
mail/thunderbird: update to 115.3.0 (ga)
-rw-r--r--mail/thunderbird/Makefile23
-rw-r--r--mail/thunderbird/distinfo6
-rw-r--r--mail/thunderbird/files/patch-addon-search26
-rw-r--r--mail/thunderbird/files/patch-bug1504834_comment1010
-rw-r--r--mail/thunderbird/files/patch-bug1504834_comment573
-rw-r--r--mail/thunderbird/files/patch-bug1504834_comment949
-rw-r--r--mail/thunderbird/files/patch-bug155921339
-rw-r--r--mail/thunderbird/files/patch-bug164098215
-rw-r--r--mail/thunderbird/files/patch-bug165961222
-rw-r--r--mail/thunderbird/files/patch-bug1729459_comment1293
-rw-r--r--mail/thunderbird/files/patch-bug84756810
-rw-r--r--mail/thunderbird/files/patch-i386-protobuf-alignment15
-rw-r--r--mail/thunderbird/files/patch-js_public_Utility.h35
-rw-r--r--mail/thunderbird/files/patch-libwebrtc-generated39764
-rw-r--r--mail/thunderbird/files/patch-modules_fdlibm_src_math__private.h27
-rw-r--r--mail/thunderbird/files/patch-pipewire_init67
-rw-r--r--mail/thunderbird/files/patch-python_mozbuild_mozbuild_gn__processor.py48
-rw-r--r--mail/thunderbird/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn31
-rw-r--r--mail/thunderbird/files/patch-third__party_libwebrtc_rtc__base_ip__address.cc23
-rw-r--r--mail/thunderbird/files/patch-third__party_sqlite3_src_moz.build12
-rw-r--r--mail/thunderbird/files/patch-toolkit_xre_glxtest.cpp17
21 files changed, 33049 insertions, 7356 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 932a2c01c868..d9550f9d9feb 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,8 +1,9 @@
PORTNAME= thunderbird
-DISTVERSION= 102.15.1
+DISTVERSION= 115.3.0
+PORTREVISION= 1
CATEGORIES= mail news net-im wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org
@@ -10,14 +11,13 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
WWW= https://www.mozilla.com/thunderbird/
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
- nss>=3.79:security/nss \
- icu>=71.1,1:devel/icu \
+ nss>=3.90:security/nss \
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 \
@@ -29,7 +29,9 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \
SSP_UNSAFE= yes
USE_GECKO= gecko
-USE_MOZILLA= -sqlite
+# cannot use system icu: calendar is completely broken by
+# https://unicode-org.atlassian.net/browse/ICU-22132 (fix ETA 74.1)
+USE_MOZILLA= -icu -sqlite
CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234
USES= tar:xz
@@ -67,11 +69,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/comm/mail/app/nsMailApp.cpp
-pre-configure:
- (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
- (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf2.13)
- (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
-
port-pre-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 0c7bf367415f..5f41ee990f59 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694536359
-SHA256 (thunderbird-102.15.1.source.tar.xz) = a20d53bbb3c01cea86b34da3907536f750421ae283cb527eef6bf81acbb8a038
-SIZE (thunderbird-102.15.1.source.tar.xz) = 504786376
+TIMESTAMP = 1695746048
+SHA256 (thunderbird-115.3.0.source.tar.xz) = 2b9ba16d737fdfb91055d75e43e20cd457254e9fa5b097cecdc1b0cc64818fc3
+SIZE (thunderbird-115.3.0.source.tar.xz) = 533553340
diff --git a/mail/thunderbird/files/patch-addon-search b/mail/thunderbird/files/patch-addon-search
index 26e9043e4d1a..3ad8200e72c1 100644
--- a/mail/thunderbird/files/patch-addon-search
+++ b/mail/thunderbird/files/patch-addon-search
@@ -1,9 +1,9 @@
https://github.com/mozilla/addons/issues/708
https://github.com/mozilla/addons-frontend/issues/4610
---- comm/mail/app/profile/all-thunderbird.js.orig 2022-09-10 23:48:23.616215000 +0200
-+++ comm/mail/app/profile/all-thunderbird.js 2022-09-11 00:01:06.140736000 +0200
-@@ -167,10 +167,10 @@
+--- comm/mail/app/profile/all-thunderbird.js.orig 2023-09-18 22:38:56.049701000 +0200
++++ comm/mail/app/profile/all-thunderbird.js 2023-09-18 22:41:26.840390000 +0200
+@@ -207,10 +207,10 @@
pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%");
pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/");
pref("browser.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/language-tools/");
@@ -18,7 +18,7 @@ https://github.com/mozilla/addons-frontend/issues/4610
pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%");
pref("extensions.getAddons.discovery.api_url", "https://services.addons.thunderbird.net/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
-@@ -202,9 +202,9 @@
+@@ -242,9 +242,9 @@
// .. etc ..
//
pref("extensions.update.enabled", true);
@@ -30,20 +30,20 @@ https://github.com/mozilla/addons-frontend/issues/4610
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
// Themes every day
---- toolkit/mozapps/extensions/internal/AddonRepository.jsm.orig 2022-09-11 00:01:40.212952000 +0200
-+++ toolkit/mozapps/extensions/internal/AddonRepository.jsm 2022-09-11 00:07:14.587890000 +0200
-@@ -592,7 +592,7 @@
+--- toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs.orig 2023-09-18 22:35:42.082170000 +0200
++++ toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs 2023-09-18 22:36:14.313490000 +0200
+@@ -596,7 +596,7 @@
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);
}
---- toolkit/mozapps/extensions/internal/XPIDatabase.jsm.orig 2022-09-11 00:08:09.244518000 +0200
-+++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm 2022-09-11 00:09:56.387390000 +0200
-@@ -569,7 +569,7 @@
+--- toolkit/mozapps/extensions/internal/XPIDatabase.jsm.orig 2023-09-18 22:36:52.473447000 +0200
++++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm 2023-09-18 22:37:26.177990000 +0200
+@@ -634,7 +634,7 @@
// Something is causing errors in here
try {
for (let platform of this.targetPlatforms) {
diff --git a/mail/thunderbird/files/patch-bug1504834_comment10 b/mail/thunderbird/files/patch-bug1504834_comment10
index e8e28bace434..2d584adb17ef 100644
--- a/mail/thunderbird/files/patch-bug1504834_comment10
+++ b/mail/thunderbird/files/patch-bug1504834_comment10
@@ -14,10 +14,11 @@ Solution: This is not a real solution, but a hack. The real solution would have
are readable, albeit not as pretty to look at as they could be.
Side-effects: I have not yet found an unwanted side-effect.
-diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
---- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200
-+++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100
-@@ -1861,6 +1861,14 @@
+diff --git gfx/2d/DrawTargetSkia.cpp gfx/2d/DrawTargetSkia.cpp
+index 6bbef8d..161b96f 100644
+--- gfx/2d/DrawTargetSkia.cpp
++++ gfx/2d/DrawTargetSkia.cpp
+@@ -1903,6 +1903,14 @@ void DrawTargetSkia::PushLayerWithBlend(bool aOpaque, Float aOpacity,
SkCanvas::kPreserveLCDText_SaveLayerFlag |
(aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
@@ -32,3 +33,4 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
mCanvas->saveLayer(saveRec);
SetPermitSubpixelAA(aOpaque);
+
diff --git a/mail/thunderbird/files/patch-bug1504834_comment5 b/mail/thunderbird/files/patch-bug1504834_comment5
index db2663ccfb34..b9897e0b7f66 100644
--- a/mail/thunderbird/files/patch-bug1504834_comment5
+++ b/mail/thunderbird/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/mail/thunderbird/files/patch-bug1504834_comment9 b/mail/thunderbird/files/patch-bug1504834_comment9
deleted file mode 100644
index c3d149ffa37b..000000000000
--- a/mail/thunderbird/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/mail/thunderbird/files/patch-bug1559213 b/mail/thunderbird/files/patch-bug1559213
index 09b4dcc58e83..49bbb0fb05ff 100644
--- a/mail/thunderbird/files/patch-bug1559213
+++ b/mail/thunderbird/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/mail/thunderbird/files/patch-bug1640982 b/mail/thunderbird/files/patch-bug1640982
deleted file mode 100644
index dae6ca5fa7b5..000000000000
--- a/mail/thunderbird/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/mail/thunderbird/files/patch-bug1659612 b/mail/thunderbird/files/patch-bug1659612
index dce125b883d2..a7aea97734a0 100644
--- a/mail/thunderbird/files/patch-bug1659612
+++ b/mail/thunderbird/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/mail/thunderbird/files/patch-bug1729459_comment12 b/mail/thunderbird/files/patch-bug1729459_comment12
deleted file mode 100644
index dda42170f71b..000000000000
--- a/mail/thunderbird/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/mail/thunderbird/files/patch-bug847568 b/mail/thunderbird/files/patch-bug847568
index 3161dbb88d08..2b3c5e14e99e 100644
--- a/mail/thunderbird/files/patch-bug847568
+++ b/mail/thunderbird/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/mail/thunderbird/files/patch-i386-protobuf-alignment b/mail/thunderbird/files/patch-i386-protobuf-alignment
new file mode 100644
index 000000000000..0d58c8644e79
--- /dev/null
+++ b/mail/thunderbird/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/mail/thunderbird/files/patch-js_public_Utility.h b/mail/thunderbird/files/patch-js_public_Utility.h
new file mode 100644
index 000000000000..4c2e16bc932c
--- /dev/null
+++ b/mail/thunderbird/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/mail/thunderbird/files/patch-libwebrtc-generated b/mail/thunderbird/files/patch-libwebrtc-generated
index d7f0fdecd9c8..9790b777a007 100644
--- a/mail/thunderbird/files/patch-libwebrtc-generated
+++ b/mail/thunderbird/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"]