aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2022-11-07 20:51:37 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2022-11-07 20:51:37 +0000
commit80898b526334682fb8e63f1a6e7e2c9029bfa19d (patch)
treedd4afebe23635c69f23adabc85a2849d3981123d
parentca64d608faec1ca98c312d8ecaf217fe83384209 (diff)
downloadports-80898b526334682fb8e63f1a6e7e2c9029bfa19d.tar.gz
ports-80898b526334682fb8e63f1a6e7e2c9029bfa19d.zip
www/firefox: update to 107.0 (rc1)
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/distinfo6
-rw-r--r--www/firefox/files/patch-libwebrtc-generated8629
-rw-r--r--www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py30
4 files changed, 5141 insertions, 3528 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2623d61a6053..bf87649f6ed6 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 106.0.5
+DISTVERSION= 107.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -11,7 +11,7 @@ COMMENT= Web browser based on the browser portion of Mozilla
WWW= https://www.mozilla.com/firefox
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
- nss>=3.83:security/nss \
+ nss>=3.84:security/nss \
icu>=71.1:devel/icu \
libevent>=2.1.8:devel/libevent \
harfbuzz>=4.4.1:print/harfbuzz \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index c9a5939e0d5e..a261f5b893a1 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667588934
-SHA256 (firefox-106.0.5.source.tar.xz) = 9471a7610d0adc350f14c363f1fcd2e15a85f22744f5850604af01aa844bc8a8
-SIZE (firefox-106.0.5.source.tar.xz) = 500379208
+TIMESTAMP = 1667849286
+SHA256 (firefox-107.0.source.tar.xz) = 07a94156c10da66aa7e0bc165b3baf306934c2e199144148845d6d7faa92cf63
+SIZE (firefox-107.0.source.tar.xz) = 502971200
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 925a9eebc060..6025ef6fafc5 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,20 +1,19 @@
-commit 92fd9b62fee80dc5abd172e1d1e15bb7d277b9fe
+commit 798fee7dc5e46be98cf353e90548f560642199ef
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-Date: Sun Oct 9 19:16:04 2022 +0000
+Date: Mon Nov 7 20:21:22 2022 +0000
- Regenerate build config for libwebrtc/Firefox 106
+ Regenerate libwebrtc build config for Firefox 107.0
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 8fbfa680375d..f23f8119fc14 100644
+index 8fbfa680375d..ae63fb378f55 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -30,7 +29,7 @@ index 8fbfa680375d..f23f8119fc14 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -156,9 +155,10 @@ index 8fbfa680375d..f23f8119fc14 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 += [
@@ -194,16 +194,15 @@ index 8fbfa680375d..f23f8119fc14 100644
-
Library("resource_adaptation_api_gn")
diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index 06d73f689afb..a5ae7135d079 100644
+index 06d73f689afb..c5891c7c798d 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -219,7 +218,7 @@ index 06d73f689afb..a5ae7135d079 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -341,9 +340,10 @@ index 06d73f689afb..a5ae7135d079 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 += [
@@ -379,16 +379,15 @@ index 06d73f689afb..a5ae7135d079 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 64f93961ccb7..acab459443e2 100644
+index 64f93961ccb7..b9e2837ed52e 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -404,7 +403,7 @@ index 64f93961ccb7..acab459443e2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -530,9 +529,10 @@ index 64f93961ccb7..acab459443e2 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 += [
@@ -568,16 +568,15 @@ index 64f93961ccb7..acab459443e2 100644
-
Library("aec3_config_gn")
diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index d71f5541616d..558bb7943024 100644
+index d71f5541616d..a7fe2cda7f26 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -594,7 +593,7 @@ index d71f5541616d..558bb7943024 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -731,9 +730,10 @@ index d71f5541616d..558bb7943024 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 += [
@@ -769,16 +769,15 @@ index d71f5541616d..558bb7943024 100644
-
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 51787695ffb8..438a82e5f08d 100644
+index 51787695ffb8..2e07cdc574e5 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -794,7 +793,7 @@ index 51787695ffb8..438a82e5f08d 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -924,9 +923,10 @@ index 51787695ffb8..438a82e5f08d 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 += [
@@ -962,16 +962,15 @@ index 51787695ffb8..438a82e5f08d 100644
-
Library("audio_frame_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index c284e7a34fd9..89b60b6adcc7 100644
+index c284e7a34fd9..d5f3c49482ac 100644
--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -987,7 +986,7 @@ index c284e7a34fd9..89b60b6adcc7 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1105,9 +1104,10 @@ index c284e7a34fd9..89b60b6adcc7 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 += [
@@ -1143,16 +1143,15 @@ index c284e7a34fd9..89b60b6adcc7 100644
-
Library("audio_frame_processor_gn")
diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 8b0f06e3f145..29b7f946ba87 100644
+index 8b0f06e3f145..2be918cdbead 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1168,7 +1167,7 @@ index 8b0f06e3f145..29b7f946ba87 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1294,9 +1293,10 @@ index 8b0f06e3f145..29b7f946ba87 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 += [
@@ -1332,16 +1332,15 @@ index 8b0f06e3f145..29b7f946ba87 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 e5049191901e..58234d4610d8 100644
+index e5049191901e..35a84d063d3d 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1357,7 +1356,7 @@ index e5049191901e..58234d4610d8 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1479,9 +1478,10 @@ index e5049191901e..58234d4610d8 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 += [
@@ -1517,16 +1517,15 @@ index e5049191901e..58234d4610d8 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 d025ed5250e6..419f847fe20f 100644
+index d025ed5250e6..8ec8ad30d40b 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1542,7 +1541,7 @@ index d025ed5250e6..419f847fe20f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1672,9 +1671,10 @@ index d025ed5250e6..419f847fe20f 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 += [
@@ -1710,16 +1710,15 @@ index d025ed5250e6..419f847fe20f 100644
-
Library("audio_decoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index 186075c3592b..7797ed797e36 100644
+index 186075c3592b..07db614cbc2b 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1735,7 +1734,7 @@ index 186075c3592b..7797ed797e36 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1865,9 +1864,10 @@ index 186075c3592b..7797ed797e36 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 += [
@@ -1903,16 +1903,15 @@ index 186075c3592b..7797ed797e36 100644
-
Library("audio_encoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 7c58a9f33356..72833fd6f9aa 100644
+index 7c58a9f33356..8726a7a6063d 100644
--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1928,7 +1927,7 @@ index 7c58a9f33356..72833fd6f9aa 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,165 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2058,9 +2057,10 @@ index 7c58a9f33356..72833fd6f9aa 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 += [
@@ -2096,16 +2096,15 @@ index 7c58a9f33356..72833fd6f9aa 100644
-
Library("audio_codecs_api_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index 2358f3537290..ab88b7abb087 100644
+index 2358f3537290..07a254f760fb 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -12,12 +12,25 @@ AllowCompilerWarnings()
+@@ -12,12 +12,24 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2125,7 +2124,7 @@ index 2358f3537290..ab88b7abb087 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,220 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,220 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2279,9 +2278,10 @@ index 2358f3537290..ab88b7abb087 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -2348,16 +2348,15 @@ index 2358f3537290..ab88b7abb087 100644
-
Library("builtin_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index e43ff4a5fe68..09c6d9c245ce 100644
+index e43ff4a5fe68..060bfa387087 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -12,12 +12,25 @@ AllowCompilerWarnings()
+@@ -12,12 +12,24 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2377,7 +2376,7 @@ index e43ff4a5fe68..09c6d9c245ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,220 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,220 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2531,9 +2530,10 @@ index e43ff4a5fe68..09c6d9c245ce 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -2600,16 +2600,15 @@ index e43ff4a5fe68..09c6d9c245ce 100644
-
Library("builtin_audio_encoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index 5756aae03b99..904d42838080 100644
+index 5756aae03b99..d8962da6b881 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2625,7 +2624,7 @@ index 5756aae03b99..904d42838080 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2755,9 +2754,10 @@ index 5756aae03b99..904d42838080 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 += [
@@ -2793,16 +2793,15 @@ index 5756aae03b99..904d42838080 100644
-
Library("audio_decoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index 3bb22b01e15e..b9faa14f0843 100644
+index 3bb22b01e15e..6c62151f3d29 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2818,7 +2817,7 @@ index 3bb22b01e15e..b9faa14f0843 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2948,9 +2947,10 @@ index 3bb22b01e15e..b9faa14f0843 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 += [
@@ -2986,16 +2986,15 @@ index 3bb22b01e15e..b9faa14f0843 100644
-
Library("audio_encoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index a9afcbe28056..3866e0ea8547 100644
+index a9afcbe28056..427e38b00c24 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -3011,7 +3010,7 @@ index a9afcbe28056..3866e0ea8547 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3141,9 +3140,10 @@ index a9afcbe28056..3866e0ea8547 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 += [
@@ -3179,16 +3179,15 @@ index a9afcbe28056..3866e0ea8547 100644
-
Library("audio_decoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 3e710cfd51dc..68fb6b5bda2f 100644
+index 3e710cfd51dc..9d46d596bd05 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -3204,7 +3203,7 @@ index 3e710cfd51dc..68fb6b5bda2f 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3322,9 +3321,10 @@ index 3e710cfd51dc..68fb6b5bda2f 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 += [
@@ -3360,16 +3360,15 @@ index 3e710cfd51dc..68fb6b5bda2f 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 2b256f932449..451c998613c4 100644
+index 2b256f932449..6286d70ea4a1 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -3385,7 +3384,7 @@ index 2b256f932449..451c998613c4 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3515,9 +3514,10 @@ index 2b256f932449..451c998613c4 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 += [
@@ -3553,16 +3553,15 @@ index 2b256f932449..451c998613c4 100644
-
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 b7b4646a9abf..7241cf3b1585 100644
+index b7b4646a9abf..09208b320dfc 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -3578,7 +3577,7 @@ index b7b4646a9abf..7241cf3b1585 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3715,9 +3714,10 @@ index b7b4646a9abf..7241cf3b1585 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 += [
@@ -3753,16 +3753,15 @@ index b7b4646a9abf..7241cf3b1585 100644
-
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 4cf820803941..9d6387b318f3 100644
+index 4cf820803941..3ef29f916d87 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -3778,7 +3777,7 @@ index 4cf820803941..9d6387b318f3 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3896,9 +3895,10 @@ index 4cf820803941..9d6387b318f3 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 += [
@@ -3934,16 +3934,15 @@ index 4cf820803941..9d6387b318f3 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 dc62483739dc..b146bb2fc729 100644
+index dc62483739dc..ac5ecbf32e96 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -3959,7 +3958,7 @@ index dc62483739dc..b146bb2fc729 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4096,9 +4095,10 @@ index dc62483739dc..b146bb2fc729 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 += [
@@ -4133,17 +4133,114 @@ index dc62483739dc..b146bb2fc729 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("audio_encoder_ilbc_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
+deleted file mode 100644
+index ae427db481e0..000000000000
+--- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
++++ /dev/null
+@@ -1,92 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-CXXFLAGS += [
+- "-mfpu=neon"
+-]
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "log",
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+-
+- OS_LIBS += [
+- "rt"
+- ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("audio_decoder_isac_fix_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 79448f7ca668..258eb8188f74 100644
+index 79448f7ca668..167114131098 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -4159,7 +4256,7 @@ index 79448f7ca668..258eb8188f74 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,151 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,151 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4287,9 +4384,10 @@ index 79448f7ca668..258eb8188f74 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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -4313,16 +4411,15 @@ index 79448f7ca668..258eb8188f74 100644
-
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 cdff79e2c7d3..27e148d646f1 100644
+index cdff79e2c7d3..7e72a8ededa9 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
-@@ -12,10 +12,23 @@ AllowCompilerWarnings()
+@@ -12,10 +12,22 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -4340,7 +4437,7 @@ index cdff79e2c7d3..27e148d646f1 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,216 +50,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,216 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4490,9 +4587,10 @@ index cdff79e2c7d3..27e148d646f1 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -4558,17 +4656,114 @@ index cdff79e2c7d3..27e148d646f1 100644
- ]
-
Library("audio_decoder_isac_gn")
+diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build
+deleted file mode 100644
+index acf5e3b6b2bd..000000000000
+--- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build
++++ /dev/null
+@@ -1,92 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-CXXFLAGS += [
+- "-mfpu=neon"
+-]
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "log",
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+-
+- OS_LIBS += [
+- "rt"
+- ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("audio_encoder_isac_fix_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 062e40e48a26..71e10369b48d 100644
+index 062e40e48a26..1d5c80c1159a 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -4584,7 +4779,7 @@ index 062e40e48a26..71e10369b48d 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,151 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,151 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4712,9 +4907,10 @@ index 062e40e48a26..71e10369b48d 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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -4738,16 +4934,15 @@ index 062e40e48a26..71e10369b48d 100644
-
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 85ed834881df..bb1346c3a314 100644
+index 85ed834881df..ec111c935c6a 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
-@@ -12,10 +12,23 @@ AllowCompilerWarnings()
+@@ -12,10 +12,22 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -4765,7 +4960,7 @@ index 85ed834881df..bb1346c3a314 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,216 +50,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,216 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4915,9 +5110,10 @@ index 85ed834881df..bb1346c3a314 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -4984,16 +5180,15 @@ index 85ed834881df..bb1346c3a314 100644
-
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 a47f2d8c8987..b870cd90c718 100644
+index a47f2d8c8987..da22d5bf985b 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -5009,7 +5204,7 @@ index a47f2d8c8987..b870cd90c718 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5139,9 +5334,10 @@ index a47f2d8c8987..b870cd90c718 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 += [
@@ -5177,16 +5373,15 @@ index a47f2d8c8987..b870cd90c718 100644
-
Library("audio_decoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index 3359d9b0b85d..4a017c2b8558 100644
+index 3359d9b0b85d..7d82c70e035e 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -5202,7 +5397,7 @@ index 3359d9b0b85d..4a017c2b8558 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5320,9 +5515,10 @@ index 3359d9b0b85d..4a017c2b8558 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 += [
@@ -5358,16 +5554,15 @@ index 3359d9b0b85d..4a017c2b8558 100644
-
Library("audio_decoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index d60041f77dc5..b6db81c67069 100644
+index d60041f77dc5..4593eca0c892 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -5383,7 +5578,7 @@ index d60041f77dc5..b6db81c67069 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5520,9 +5715,10 @@ index d60041f77dc5..b6db81c67069 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 += [
@@ -5558,16 +5754,15 @@ index d60041f77dc5..b6db81c67069 100644
-
Library("audio_decoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index aef6a673e58b..c93db9597e57 100644
+index aef6a673e58b..4dbae51c514c 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -5583,7 +5778,7 @@ index aef6a673e58b..c93db9597e57 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5713,9 +5908,10 @@ index aef6a673e58b..c93db9597e57 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 += [
@@ -5751,16 +5947,15 @@ index aef6a673e58b..c93db9597e57 100644
-
Library("audio_encoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index 3d874ea71a9f..604c680009e7 100644
+index 3d874ea71a9f..def6bf949751 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,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -5777,7 +5972,7 @@ index 3d874ea71a9f..604c680009e7 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,157 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,157 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5899,9 +6094,10 @@ index 3d874ea71a9f..604c680009e7 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 += [
@@ -5937,16 +6133,15 @@ index 3d874ea71a9f..604c680009e7 100644
-
Library("audio_encoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index 98bce2f651e4..45bc3b5f89d1 100644
+index 98bce2f651e4..ca241f4f1697 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -5962,7 +6157,7 @@ index 98bce2f651e4..45bc3b5f89d1 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6099,9 +6294,10 @@ index 98bce2f651e4..45bc3b5f89d1 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 += [
@@ -6137,16 +6333,15 @@ index 98bce2f651e4..45bc3b5f89d1 100644
-
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 b11d9b3ffff3..818d61c240e7 100644
+index b11d9b3ffff3..ad7438cf6f52 100644
--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -6162,7 +6357,7 @@ index b11d9b3ffff3..818d61c240e7 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6288,9 +6483,10 @@ index b11d9b3ffff3..818d61c240e7 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 += [
@@ -6326,16 +6522,15 @@ index b11d9b3ffff3..818d61c240e7 100644
-
Library("audio_options_api_gn")
diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index 7154df99fcc0..06dd10263272 100644
+index 7154df99fcc0..6bfa9af65ffd 100644
--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -6351,7 +6546,7 @@ index 7154df99fcc0..06dd10263272 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6473,9 +6668,10 @@ index 7154df99fcc0..06dd10263272 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 += [
@@ -6511,16 +6707,15 @@ index 7154df99fcc0..06dd10263272 100644
-
Library("bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index 425aeeafa82c..a596390b1389 100644
+index 425aeeafa82c..62ea77045905 100644
--- third_party/libwebrtc/api/call_api_gn/moz.build
+++ third_party/libwebrtc/api/call_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -6536,7 +6731,7 @@ index 425aeeafa82c..a596390b1389 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6654,9 +6849,10 @@ index 425aeeafa82c..a596390b1389 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 += [
@@ -6692,16 +6888,15 @@ index 425aeeafa82c..a596390b1389 100644
-
Library("call_api_gn")
diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build
-index 44caaf90094f..b4ebe6055d6d 100644
+index 44caaf90094f..4fb736b419fc 100644
--- third_party/libwebrtc/api/callfactory_api_gn/moz.build
+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -6717,7 +6912,7 @@ index 44caaf90094f..b4ebe6055d6d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6852,9 +7047,10 @@ index 44caaf90094f..b4ebe6055d6d 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 += [
@@ -6890,16 +7086,15 @@ index 44caaf90094f..b4ebe6055d6d 100644
-
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 6b98ea51a638..a2ed68fcef74 100644
+index 6b98ea51a638..d48614ca4acf 100644
--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -6915,7 +7110,7 @@ index 6b98ea51a638..a2ed68fcef74 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7037,9 +7232,10 @@ index 6b98ea51a638..a2ed68fcef74 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 += [
@@ -7075,16 +7271,15 @@ index 6b98ea51a638..a2ed68fcef74 100644
-
Library("frame_decryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index bb577371367e..dac73cb9b824 100644
+index bb577371367e..3fbc6a37c593 100644
--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -7100,7 +7295,7 @@ index bb577371367e..dac73cb9b824 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7222,9 +7417,10 @@ index bb577371367e..dac73cb9b824 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 += [
@@ -7260,16 +7456,15 @@ index bb577371367e..dac73cb9b824 100644
-
Library("frame_encryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index 91d676f63fba..29a2d612b2e4 100644
+index 91d676f63fba..a6736f1c26f9 100644
--- third_party/libwebrtc/api/crypto/options_gn/moz.build
+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -7285,7 +7480,7 @@ index 91d676f63fba..29a2d612b2e4 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7424,9 +7619,10 @@ index 91d676f63fba..29a2d612b2e4 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 += [
@@ -7462,16 +7658,15 @@ index 91d676f63fba..29a2d612b2e4 100644
-
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 ea29beb6b0c7..24ec4dfc1807 100644
+index ea29beb6b0c7..855dbcea1112 100644
--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -7487,7 +7682,7 @@ index ea29beb6b0c7..24ec4dfc1807 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7605,9 +7800,10 @@ index ea29beb6b0c7..24ec4dfc1807 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 += [
@@ -7643,16 +7839,15 @@ index ea29beb6b0c7..24ec4dfc1807 100644
-
Library("fec_controller_api_gn")
diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index 813d5856192a..9154463d44e0 100644
+index 813d5856192a..486b6a2fe58a 100644
--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -7668,7 +7863,7 @@ index 813d5856192a..9154463d44e0 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7786,9 +7981,10 @@ index 813d5856192a..9154463d44e0 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 += [
@@ -7824,16 +8020,15 @@ index 813d5856192a..9154463d44e0 100644
-
Library("field_trials_view_gn")
diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index a89762beef0c..088eac127c70 100644
+index a89762beef0c..eb60f39f5d55 100644
--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -7849,7 +8044,7 @@ index a89762beef0c..088eac127c70 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7984,9 +8179,10 @@ index a89762beef0c..088eac127c70 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 += [
@@ -8022,16 +8218,15 @@ index a89762beef0c..088eac127c70 100644
-
Library("frame_transformer_interface_gn")
diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index c262278451c8..657480730866 100644
+index c262278451c8..ed26b77d1acd 100644
--- third_party/libwebrtc/api/function_view_gn/moz.build
+++ third_party/libwebrtc/api/function_view_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -8047,7 +8242,7 @@ index c262278451c8..657480730866 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8169,9 +8364,10 @@ index c262278451c8..657480730866 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 += [
@@ -8207,16 +8403,15 @@ index c262278451c8..657480730866 100644
-
Library("function_view_gn")
diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index 24c1fe3c203d..1337d9313a76 100644
+index 24c1fe3c203d..e9b919471baa 100644
--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -8232,7 +8427,7 @@ index 24c1fe3c203d..1337d9313a76 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8350,9 +8545,10 @@ index 24c1fe3c203d..1337d9313a76 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 += [
@@ -8388,16 +8584,15 @@ index 24c1fe3c203d..1337d9313a76 100644
-
Library("jingle_logging_api_gn")
diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index 841bc83b09cd..8a35b87b0ad4 100644
+index 841bc83b09cd..d367856e783e 100644
--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -8413,7 +8608,7 @@ index 841bc83b09cd..8a35b87b0ad4 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8543,9 +8738,10 @@ index 841bc83b09cd..8a35b87b0ad4 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 += [
@@ -8581,16 +8777,15 @@ index 841bc83b09cd..8a35b87b0ad4 100644
-
Library("media_stream_interface_gn")
diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index 2c29acea7a4a..42c6c5a01d92 100644
+index 2c29acea7a4a..7ab82acf29f7 100644
--- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
+++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -8606,7 +8801,7 @@ index 2c29acea7a4a..42c6c5a01d92 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8728,9 +8923,10 @@ index 2c29acea7a4a..42c6c5a01d92 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 += [
@@ -8766,16 +8962,15 @@ index 2c29acea7a4a..42c6c5a01d92 100644
-
Library("metronome_gn")
diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index e04fd248be78..88cc6d23c536 100644
+index e04fd248be78..e47e83a0f9c6 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -8791,7 +8986,7 @@ index e04fd248be78..88cc6d23c536 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8928,9 +9123,10 @@ index e04fd248be78..88cc6d23c536 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 += [
@@ -8966,16 +9162,15 @@ index e04fd248be78..88cc6d23c536 100644
-
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 a12067d17032..48a1216971e2 100644
+index a12067d17032..056da03b49a4 100644
--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -8991,7 +9186,7 @@ index a12067d17032..48a1216971e2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9128,9 +9323,10 @@ index a12067d17032..48a1216971e2 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 += [
@@ -9166,16 +9362,15 @@ index a12067d17032..48a1216971e2 100644
-
Library("neteq_api_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index bf38bb498876..b9b693e8818b 100644
+index bf38bb498876..1fda731ace2d 100644
--- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -9191,7 +9386,7 @@ index bf38bb498876..b9b693e8818b 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,168 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9324,9 +9519,10 @@ index bf38bb498876..b9b693e8818b 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 += [
@@ -9362,16 +9558,15 @@ index bf38bb498876..b9b693e8818b 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 a96170cca7bc..7dcf2677a5a9 100644
+index a96170cca7bc..7e0bbb099199 100644
--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
+++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -9387,7 +9582,7 @@ index a96170cca7bc..7dcf2677a5a9 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9513,9 +9708,10 @@ index a96170cca7bc..7dcf2677a5a9 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 += [
@@ -9551,16 +9747,15 @@ index a96170cca7bc..7dcf2677a5a9 100644
-
Library("tick_timer_gn")
diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index a5e84246e633..9f7fc405a4ee 100644
+index a5e84246e633..2abf269dbf4a 100644
--- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -9576,7 +9771,7 @@ index a5e84246e633..9f7fc405a4ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9694,9 +9889,10 @@ index a5e84246e633..9f7fc405a4ee 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 += [
@@ -9732,16 +9928,15 @@ index a5e84246e633..9f7fc405a4ee 100644
-
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 44d6d1c751d0..97d7351bf03e 100644
+index 44d6d1c751d0..bb061c59b10d 100644
--- third_party/libwebrtc/api/numerics/numerics_gn/moz.build
+++ third_party/libwebrtc/api/numerics/numerics_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -9757,7 +9952,7 @@ index 44d6d1c751d0..97d7351bf03e 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9887,9 +10082,10 @@ index 44d6d1c751d0..97d7351bf03e 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 += [
@@ -9925,16 +10121,15 @@ index 44d6d1c751d0..97d7351bf03e 100644
-
Library("numerics_gn")
diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index 51e1eb902ed3..1b0e09ed20b7 100644
+index 51e1eb902ed3..7563b491443d 100644
--- third_party/libwebrtc/api/priority_gn/moz.build
+++ third_party/libwebrtc/api/priority_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -9950,7 +10145,7 @@ index 51e1eb902ed3..1b0e09ed20b7 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10068,9 +10263,10 @@ index 51e1eb902ed3..1b0e09ed20b7 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 += [
@@ -10106,16 +10302,15 @@ index 51e1eb902ed3..1b0e09ed20b7 100644
-
Library("priority_gn")
diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 1423641b2fec..e630e1991b44 100644
+index 1423641b2fec..8e28b1542274 100644
--- third_party/libwebrtc/api/refcountedbase_gn/moz.build
+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -10131,7 +10326,7 @@ index 1423641b2fec..e630e1991b44 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10249,9 +10444,10 @@ index 1423641b2fec..e630e1991b44 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 += [
@@ -10287,16 +10483,15 @@ index 1423641b2fec..e630e1991b44 100644
-
Library("refcountedbase_gn")
diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index a8296cb1264f..8d450ef6426f 100644
+index a8296cb1264f..3a94ae004f20 100644
--- third_party/libwebrtc/api/rtc_error_gn/moz.build
+++ third_party/libwebrtc/api/rtc_error_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -10312,7 +10507,7 @@ index a8296cb1264f..8d450ef6426f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10442,9 +10637,10 @@ index a8296cb1264f..8d450ef6426f 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 += [
@@ -10480,16 +10676,15 @@ index a8296cb1264f..8d450ef6426f 100644
-
Library("rtc_error_gn")
diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index 2b0b00877a36..f38390c3433f 100644
+index 2b0b00877a36..0d6cb6439cf4 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -10505,7 +10700,7 @@ index 2b0b00877a36..f38390c3433f 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10635,9 +10830,10 @@ index 2b0b00877a36..f38390c3433f 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 += [
@@ -10673,16 +10869,15 @@ index 2b0b00877a36..f38390c3433f 100644
-
Library("rtc_event_log_gn")
diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index 16159662427c..2ed4aa81719f 100644
+index 16159662427c..333832e7f926 100644
--- third_party/libwebrtc/api/rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -10698,7 +10893,7 @@ index 16159662427c..2ed4aa81719f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10828,9 +11023,10 @@ index 16159662427c..2ed4aa81719f 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 += [
@@ -10866,16 +11062,15 @@ index 16159662427c..2ed4aa81719f 100644
-
Library("rtp_headers_gn")
diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index a8a4516ac4d0..d3c9388ef2c2 100644
+index a8a4516ac4d0..66e3712aeb0d 100644
--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -10891,7 +11086,7 @@ index a8a4516ac4d0..d3c9388ef2c2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11021,9 +11216,10 @@ index a8a4516ac4d0..d3c9388ef2c2 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 += [
@@ -11059,16 +11255,15 @@ index a8a4516ac4d0..d3c9388ef2c2 100644
-
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 a9ad014f33ae..fa3cfef6a674 100644
+index a9ad014f33ae..cdba7283d8d2 100644
--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -11084,7 +11279,7 @@ index a9ad014f33ae..fa3cfef6a674 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,161 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,161 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11210,9 +11405,10 @@ index a9ad014f33ae..fa3cfef6a674 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 += [
@@ -11248,16 +11444,15 @@ index a9ad014f33ae..fa3cfef6a674 100644
-
Library("rtp_parameters_gn")
diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index 0c01da41542d..2d09e8124252 100644
+index 0c01da41542d..51422769eb75 100644
--- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -11273,7 +11468,7 @@ index 0c01da41542d..2d09e8124252 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11391,9 +11586,10 @@ index 0c01da41542d..2d09e8124252 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 += [
@@ -11429,16 +11625,15 @@ index 0c01da41542d..2d09e8124252 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 e7cb76ba3130..a7ce9d08c33b 100644
+index e7cb76ba3130..2179e8e9eb2b 100644
--- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -11454,7 +11649,7 @@ index e7cb76ba3130..a7ce9d08c33b 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11572,9 +11767,10 @@ index e7cb76ba3130..a7ce9d08c33b 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 += [
@@ -11610,16 +11806,15 @@ index e7cb76ba3130..a7ce9d08c33b 100644
-
Library("scoped_refptr_gn")
diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
-index 4ecc4eee613b..ac48a300780c 100644
+index 4ecc4eee613b..c85e7b523ff4 100644
--- third_party/libwebrtc/api/sequence_checker_gn/moz.build
+++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -11635,7 +11830,7 @@ index 4ecc4eee613b..ac48a300780c 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11757,9 +11952,10 @@ index 4ecc4eee613b..ac48a300780c 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 += [
@@ -11795,16 +11991,15 @@ index 4ecc4eee613b..ac48a300780c 100644
-
Library("sequence_checker_gn")
diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-index edd79b3ce1a9..680f1d9cd334 100644
+index edd79b3ce1a9..4c338c4a44c9 100644
--- third_party/libwebrtc/api/simulated_network_api_gn/moz.build
+++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -11820,7 +12015,7 @@ index edd79b3ce1a9..680f1d9cd334 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11955,9 +12150,10 @@ index edd79b3ce1a9..680f1d9cd334 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 += [
@@ -11993,16 +12189,15 @@ index edd79b3ce1a9..680f1d9cd334 100644
-
Library("simulated_network_api_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 caf50afe35c1..3b0fd81b83ab 100644
+index caf50afe35c1..fbf2388bdbfe 100644
--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -12018,7 +12213,7 @@ index caf50afe35c1..3b0fd81b83ab 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12144,9 +12339,10 @@ index caf50afe35c1..3b0fd81b83ab 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 += [
@@ -12182,16 +12378,15 @@ index caf50afe35c1..3b0fd81b83ab 100644
-
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 9ebe97971a49..0b7adba70010 100644
+index 9ebe97971a49..42be461044e1 100644
--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -12207,7 +12402,7 @@ index 9ebe97971a49..0b7adba70010 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12329,9 +12524,10 @@ index 9ebe97971a49..0b7adba70010 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 += [
@@ -12367,16 +12563,15 @@ index 9ebe97971a49..0b7adba70010 100644
-
Library("bitrate_settings_gn")
diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index 74133ed40fef..585c88eb080a 100644
+index 74133ed40fef..51fd54da9869 100644
--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -12392,7 +12587,7 @@ index 74133ed40fef..585c88eb080a 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12518,9 +12713,10 @@ index 74133ed40fef..585c88eb080a 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 += [
@@ -12556,16 +12752,15 @@ index 74133ed40fef..585c88eb080a 100644
-
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 700b5a83f026..d1aa115ddc87 100644
+index 700b5a83f026..0ec2d0d307f7 100644
--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -12581,7 +12776,7 @@ index 700b5a83f026..d1aa115ddc87 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12711,9 +12906,10 @@ index 700b5a83f026..d1aa115ddc87 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 += [
@@ -12749,16 +12945,15 @@ index 700b5a83f026..d1aa115ddc87 100644
-
Library("field_trial_based_config_gn")
diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 15ad8475cee5..17a6c364a5fa 100644
+index 15ad8475cee5..c998590d30dc 100644
--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -12774,7 +12969,7 @@ index 15ad8475cee5..17a6c364a5fa 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12913,9 +13108,10 @@ index 15ad8475cee5..17a6c364a5fa 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 += [
@@ -12951,16 +13147,15 @@ index 15ad8475cee5..17a6c364a5fa 100644
-
Library("goog_cc_gn")
diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index ba070095a280..46e79e44368d 100644
+index ba070095a280..6cd80df5eebd 100644
--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -12976,7 +13171,7 @@ index ba070095a280..46e79e44368d 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13106,9 +13301,10 @@ index ba070095a280..46e79e44368d 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 += [
@@ -13144,16 +13340,15 @@ index ba070095a280..46e79e44368d 100644
-
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 9d9283597c4f..6e55516791d3 100644
+index 9d9283597c4f..6dc78d64d0d8 100644
--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -13169,7 +13364,7 @@ index 9d9283597c4f..6e55516791d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13295,9 +13490,10 @@ index 9d9283597c4f..6e55516791d3 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 += [
@@ -13333,16 +13529,15 @@ index 9d9283597c4f..6e55516791d3 100644
-
Library("dependency_descriptor_gn")
diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index 35932b80bcab..7726c7f1436a 100644
+index 35932b80bcab..61f128ddddd3 100644
--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -13358,7 +13553,7 @@ index 35932b80bcab..7726c7f1436a 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13484,9 +13679,10 @@ index 35932b80bcab..7726c7f1436a 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 += [
@@ -13522,16 +13718,15 @@ index 35932b80bcab..7726c7f1436a 100644
-
Library("rtp_source_gn")
diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index db1ced3dcfe9..200dbdb2c966 100644
+index db1ced3dcfe9..914f1ecf2a48 100644
--- third_party/libwebrtc/api/transport_api_gn/moz.build
+++ third_party/libwebrtc/api/transport_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -13547,7 +13742,7 @@ index db1ced3dcfe9..200dbdb2c966 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13669,9 +13864,10 @@ index db1ced3dcfe9..200dbdb2c966 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 += [
@@ -13707,16 +13903,15 @@ index db1ced3dcfe9..200dbdb2c966 100644
-
Library("transport_api_gn")
diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index e4b61f80f423..d834d773b31d 100644
+index e4b61f80f423..390cf12aa90f 100644
--- third_party/libwebrtc/api/units/data_rate_gn/moz.build
+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -13732,7 +13927,7 @@ index e4b61f80f423..d834d773b31d 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13858,9 +14053,10 @@ index e4b61f80f423..d834d773b31d 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 += [
@@ -13896,16 +14092,15 @@ index e4b61f80f423..d834d773b31d 100644
-
Library("data_rate_gn")
diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index c6effb8c6fc1..9f51bb2fdebd 100644
+index c6effb8c6fc1..026f4dad3681 100644
--- third_party/libwebrtc/api/units/data_size_gn/moz.build
+++ third_party/libwebrtc/api/units/data_size_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -13921,7 +14116,7 @@ index c6effb8c6fc1..9f51bb2fdebd 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14047,9 +14242,10 @@ index c6effb8c6fc1..9f51bb2fdebd 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 += [
@@ -14085,16 +14281,15 @@ index c6effb8c6fc1..9f51bb2fdebd 100644
-
Library("data_size_gn")
diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index 788398d624c4..41b7f7c6e181 100644
+index 788398d624c4..741d1473992b 100644
--- third_party/libwebrtc/api/units/frequency_gn/moz.build
+++ third_party/libwebrtc/api/units/frequency_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -14110,7 +14305,7 @@ index 788398d624c4..41b7f7c6e181 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14236,9 +14431,10 @@ index 788398d624c4..41b7f7c6e181 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 += [
@@ -14274,16 +14470,15 @@ index 788398d624c4..41b7f7c6e181 100644
-
Library("frequency_gn")
diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index c4877791f432..5a53357a4254 100644
+index c4877791f432..d597a9f24e4c 100644
--- third_party/libwebrtc/api/units/time_delta_gn/moz.build
+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -14299,7 +14494,7 @@ index c4877791f432..5a53357a4254 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14425,9 +14620,10 @@ index c4877791f432..5a53357a4254 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 += [
@@ -14463,16 +14659,15 @@ index c4877791f432..5a53357a4254 100644
-
Library("time_delta_gn")
diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index ece2614faeb4..1facf81af80e 100644
+index ece2614faeb4..f28652669b7c 100644
--- third_party/libwebrtc/api/units/timestamp_gn/moz.build
+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -14488,7 +14683,7 @@ index ece2614faeb4..1facf81af80e 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14614,9 +14809,10 @@ index ece2614faeb4..1facf81af80e 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,16 +14848,15 @@ index ece2614faeb4..1facf81af80e 100644
-
Library("timestamp_gn")
diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index d130ac6e1cd0..2a397a451658 100644
+index d130ac6e1cd0..44ac4c47088c 100644
--- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -14677,7 +14872,7 @@ index d130ac6e1cd0..2a397a451658 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14816,9 +15011,10 @@ index d130ac6e1cd0..2a397a451658 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 += [
@@ -14854,16 +15050,15 @@ index d130ac6e1cd0..2a397a451658 100644
-
Library("builtin_video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index 90f9758d7fee..c7c05fa0c3ba 100644
+index 90f9758d7fee..f07da7eaf70e 100644
--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -14879,7 +15074,7 @@ index 90f9758d7fee..c7c05fa0c3ba 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15018,9 +15213,10 @@ index 90f9758d7fee..c7c05fa0c3ba 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 += [
@@ -15056,16 +15252,15 @@ index 90f9758d7fee..c7c05fa0c3ba 100644
-
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index 05a9a4067a31..85723519ccb5 100644
+index 05a9a4067a31..8fa369c1980c 100644
--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -15081,7 +15276,7 @@ index 05a9a4067a31..85723519ccb5 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15211,9 +15406,10 @@ index 05a9a4067a31..85723519ccb5 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 += [
@@ -15249,16 +15445,15 @@ index 05a9a4067a31..85723519ccb5 100644
-
Library("encoded_image_gn")
diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index de9fae8d7883..bf30610f9c63 100644
+index de9fae8d7883..baf7786008e4 100644
--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
+++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -15274,7 +15469,7 @@ index de9fae8d7883..bf30610f9c63 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15413,9 +15608,10 @@ index de9fae8d7883..bf30610f9c63 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 += [
@@ -15451,16 +15647,15 @@ index de9fae8d7883..bf30610f9c63 100644
-
Library("frame_buffer_gn")
diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index ba2d0e06e50f..5b93ae42a642 100644
+index ba2d0e06e50f..c00eefe5acf5 100644
--- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -15476,7 +15671,7 @@ index ba2d0e06e50f..5b93ae42a642 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15602,9 +15797,10 @@ index ba2d0e06e50f..5b93ae42a642 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 += [
@@ -15640,16 +15836,15 @@ index ba2d0e06e50f..5b93ae42a642 100644
-
Library("recordable_encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-index 5a0526681876..7d17b214c45f 100644
+index 5a0526681876..61faae79fea9 100644
--- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -15665,7 +15860,7 @@ index 5a0526681876..7d17b214c45f 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15783,9 +15978,10 @@ index 5a0526681876..7d17b214c45f 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 += [
@@ -15821,16 +16017,15 @@ index 5a0526681876..7d17b214c45f 100644
-
Library("render_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 803834e23d90..0a2909a50ba2 100644
+index 803834e23d90..89ecd2a4c40d 100644
--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -15846,7 +16041,7 @@ index 803834e23d90..0a2909a50ba2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15972,9 +16167,10 @@ index 803834e23d90..0a2909a50ba2 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 += [
@@ -16010,16 +16206,15 @@ index 803834e23d90..0a2909a50ba2 100644
-
Library("video_adaptation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index e6dad3687eb7..b37dfdecda65 100644
+index e6dad3687eb7..08b201cf6757 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -16035,7 +16230,7 @@ index e6dad3687eb7..b37dfdecda65 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16161,9 +16356,10 @@ index e6dad3687eb7..b37dfdecda65 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 += [
@@ -16199,16 +16395,15 @@ index e6dad3687eb7..b37dfdecda65 100644
-
Library("video_bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index cc38099d24f7..c548e5b28963 100644
+index cc38099d24f7..d9d33a2a6d35 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -16224,7 +16419,7 @@ index cc38099d24f7..c548e5b28963 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16350,9 +16545,10 @@ index cc38099d24f7..c548e5b28963 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 += [
@@ -16388,16 +16584,15 @@ index cc38099d24f7..c548e5b28963 100644
-
Library("video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index f82e3421bd67..1a6c4813a106 100644
+index f82e3421bd67..97898018837f 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -16413,7 +16608,7 @@ index f82e3421bd67..1a6c4813a106 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16539,9 +16734,10 @@ index f82e3421bd67..1a6c4813a106 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 += [
@@ -16577,16 +16773,15 @@ index f82e3421bd67..1a6c4813a106 100644
-
Library("video_bitrate_allocator_gn")
diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index e80c5c42b0d7..eea1000e6c81 100644
+index e80c5c42b0d7..17a30edc6c82 100644
--- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -16602,7 +16797,7 @@ index e80c5c42b0d7..eea1000e6c81 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16720,9 +16915,10 @@ index e80c5c42b0d7..eea1000e6c81 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 += [
@@ -16758,16 +16954,15 @@ index e80c5c42b0d7..eea1000e6c81 100644
-
Library("video_codec_constants_gn")
diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index 0eef21be59c9..36e9eb6e21e9 100644
+index 0eef21be59c9..18c24c05b243 100644
--- third_party/libwebrtc/api/video/video_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -16783,7 +16978,7 @@ index 0eef21be59c9..36e9eb6e21e9 100644
FINAL_LIBRARY = "webrtc"
-@@ -52,165 +63,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,165 +62,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16913,9 +17108,10 @@ index 0eef21be59c9..36e9eb6e21e9 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 += [
@@ -16951,16 +17147,15 @@ index 0eef21be59c9..36e9eb6e21e9 100644
-
Library("video_frame_gn")
diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index ebe06a2cc5b2..39aff3e0e4fb 100644
+index ebe06a2cc5b2..fecceee6a855 100644
--- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -16976,7 +17171,7 @@ index ebe06a2cc5b2..39aff3e0e4fb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,174 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17115,9 +17310,10 @@ index ebe06a2cc5b2..39aff3e0e4fb 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 += [
@@ -17153,16 +17349,15 @@ index ebe06a2cc5b2..39aff3e0e4fb 100644
-
Library("video_frame_i010_gn")
diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index 995eb12057cc..e7abdda02a58 100644
+index 995eb12057cc..384b2cf716c9 100644
--- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -17178,7 +17373,7 @@ index 995eb12057cc..e7abdda02a58 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17308,9 +17503,10 @@ index 995eb12057cc..e7abdda02a58 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 += [
@@ -17346,16 +17542,15 @@ index 995eb12057cc..e7abdda02a58 100644
-
Library("video_frame_metadata_gn")
diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index 2343ad5fbeaa..3d31faf5e4c8 100644
+index 2343ad5fbeaa..e51e1b5450ed 100644
--- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -17371,7 +17566,7 @@ index 2343ad5fbeaa..3d31faf5e4c8 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17489,9 +17684,10 @@ index 2343ad5fbeaa..3d31faf5e4c8 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 += [
@@ -17527,16 +17723,15 @@ index 2343ad5fbeaa..3d31faf5e4c8 100644
-
Library("video_frame_type_gn")
diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-index 0e6740cd6cb6..51d7a73e1690 100644
+index 0e6740cd6cb6..9f4764ca7318 100644
--- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -17552,7 +17747,7 @@ index 0e6740cd6cb6..51d7a73e1690 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17674,9 +17869,10 @@ index 0e6740cd6cb6..51d7a73e1690 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 += [
@@ -17712,16 +17908,15 @@ index 0e6740cd6cb6..51d7a73e1690 100644
-
Library("video_layers_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index b51f065414f1..fb8f5d07e578 100644
+index b51f065414f1..c6ae39ac5829 100644
--- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -17737,7 +17932,7 @@ index b51f065414f1..fb8f5d07e578 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,165 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17867,9 +18062,10 @@ index b51f065414f1..fb8f5d07e578 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 += [
@@ -17905,16 +18101,15 @@ index b51f065414f1..fb8f5d07e578 100644
-
Library("video_rtp_headers_gn")
diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index dca868cbcdc5..1057c4d747f3 100644
+index dca868cbcdc5..24b9e71b602c 100644
--- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -17930,7 +18125,7 @@ index dca868cbcdc5..1057c4d747f3 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18056,9 +18251,10 @@ index dca868cbcdc5..1057c4d747f3 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 += [
@@ -18094,16 +18290,15 @@ index dca868cbcdc5..1057c4d747f3 100644
-
Library("video_stream_encoder_gn")
diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index 9b5bb93351e8..97753bc74da2 100644
+index 9b5bb93351e8..abd841efc56a 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -18119,7 +18314,7 @@ index 9b5bb93351e8..97753bc74da2 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18241,9 +18436,10 @@ index 9b5bb93351e8..97753bc74da2 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 += [
@@ -18279,16 +18475,15 @@ index 9b5bb93351e8..97753bc74da2 100644
-
Library("bitstream_parser_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-index 080b9594bd6b..034924390705 100644
+index 080b9594bd6b..8d80ca1cc1ca 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -18304,7 +18499,7 @@ index 080b9594bd6b..034924390705 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18443,9 +18638,10 @@ index 080b9594bd6b..034924390705 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 += [
@@ -18481,16 +18677,15 @@ index 080b9594bd6b..034924390705 100644
-
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 9eaa39a7d78e..14022ae5368a 100644
+index 9eaa39a7d78e..e69cbfa9328b 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -18506,7 +18701,7 @@ index 9eaa39a7d78e..14022ae5368a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18645,9 +18840,10 @@ index 9eaa39a7d78e..14022ae5368a 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 += [
@@ -18683,16 +18879,15 @@ index 9eaa39a7d78e..14022ae5368a 100644
-
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 005c7222357d..818b7a7ade67 100644
+index 005c7222357d..cdc30aa176db 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,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -18708,7 +18903,7 @@ index 005c7222357d..818b7a7ade67 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,174 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18847,9 +19042,10 @@ index 005c7222357d..818b7a7ade67 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 += [
@@ -18885,16 +19081,15 @@ index 005c7222357d..818b7a7ade67 100644
-
Library("rtc_software_fallback_wrappers_gn")
diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-index 3b8aee86312b..3d10ed98f840 100644
+index 3b8aee86312b..574d68c4f54e 100644
--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -18910,7 +19105,7 @@ index 3b8aee86312b..3d10ed98f840 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19028,9 +19223,10 @@ index 3b8aee86312b..3d10ed98f840 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 += [
@@ -19066,16 +19262,15 @@ index 3b8aee86312b..3d10ed98f840 100644
-
Library("scalability_mode_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index 071f18ce405a..babae7069d60 100644
+index 071f18ce405a..716778253e78 100644
--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -19091,7 +19286,7 @@ index 071f18ce405a..babae7069d60 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,165 +61,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,165 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19221,9 +19416,10 @@ index 071f18ce405a..babae7069d60 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 += [
@@ -19259,16 +19455,15 @@ index 071f18ce405a..babae7069d60 100644
-
Library("video_codecs_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 7be7d67bee33..d29acb1528d6 100644
+index 7be7d67bee33..621ce78b9680 100644
--- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -19284,7 +19479,7 @@ index 7be7d67bee33..d29acb1528d6 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19423,9 +19618,10 @@ index 7be7d67bee33..d29acb1528d6 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 += [
@@ -19461,16 +19657,15 @@ index 7be7d67bee33..d29acb1528d6 100644
-
Library("vp8_temporal_layers_factory_gn")
diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index c588b3ce0e8f..05e060d7da4c 100644
+index c588b3ce0e8f..ded6e4680a88 100644
--- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -19486,7 +19681,7 @@ index c588b3ce0e8f..05e060d7da4c 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19604,9 +19799,10 @@ index c588b3ce0e8f..05e060d7da4c 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 += [
@@ -19642,16 +19838,15 @@ index c588b3ce0e8f..05e060d7da4c 100644
-
Library("video_track_source_constraints_gn")
diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index 333c77706b0d..656deb0a6af4 100644
+index 333c77706b0d..7b9c37cd58af 100644
--- third_party/libwebrtc/audio/audio_gn/moz.build
+++ third_party/libwebrtc/audio/audio_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -19667,7 +19862,7 @@ index 333c77706b0d..656deb0a6af4 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,174 +65,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,174 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19806,9 +20001,10 @@ index 333c77706b0d..656deb0a6af4 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 += [
@@ -19844,16 +20040,15 @@ index 333c77706b0d..656deb0a6af4 100644
-
Library("audio_gn")
diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index ef559b9bc6ee..501b4804d47f 100644
+index ef559b9bc6ee..cbfaaadb7d89 100644
--- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -19869,7 +20064,7 @@ index ef559b9bc6ee..501b4804d47f 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,172 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,172 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20006,9 +20201,10 @@ index ef559b9bc6ee..501b4804d47f 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 += [
@@ -20044,16 +20240,15 @@ index ef559b9bc6ee..501b4804d47f 100644
-
Library("audio_frame_operations_gn")
diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index 3c1d8cc5e85a..c1dc740d6191 100644
+index 3c1d8cc5e85a..f975048caa6c 100644
--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -20069,7 +20264,7 @@ index 3c1d8cc5e85a..c1dc740d6191 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,174 +61,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,174 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20208,9 +20403,10 @@ index 3c1d8cc5e85a..c1dc740d6191 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 += [
@@ -20246,16 +20442,15 @@ index 3c1d8cc5e85a..c1dc740d6191 100644
-
Library("resource_adaptation_gn")
diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index 8e41f2704f3c..22082e4de075 100644
+index 8e41f2704f3c..f8d69690a873 100644
--- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -20271,7 +20466,7 @@ index 8e41f2704f3c..22082e4de075 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20397,9 +20592,10 @@ index 8e41f2704f3c..22082e4de075 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 += [
@@ -20435,16 +20631,15 @@ index 8e41f2704f3c..22082e4de075 100644
-
Library("audio_sender_interface_gn")
diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index 0e14a5d16836..46cdf8d9cfe1 100644
+index 0e14a5d16836..81e9778691b7 100644
--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -20460,7 +20655,7 @@ index 0e14a5d16836..46cdf8d9cfe1 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20597,9 +20792,10 @@ index 0e14a5d16836..46cdf8d9cfe1 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 += [
@@ -20635,16 +20831,15 @@ index 0e14a5d16836..46cdf8d9cfe1 100644
-
Library("bitrate_allocator_gn")
diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index 4e17c8a7a6e4..8d564ea9c19a 100644
+index 4e17c8a7a6e4..4031e4169cf6 100644
--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -20660,7 +20855,7 @@ index 4e17c8a7a6e4..8d564ea9c19a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20799,9 +20994,10 @@ index 4e17c8a7a6e4..8d564ea9c19a 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 += [
@@ -20837,16 +21033,15 @@ index 4e17c8a7a6e4..8d564ea9c19a 100644
-
Library("bitrate_configurator_gn")
diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 8a43be523080..6fea43c513ac 100644
+index 8a43be523080..efd9bf279328 100644
--- third_party/libwebrtc/call/call_gn/moz.build
+++ third_party/libwebrtc/call/call_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -20862,7 +21057,7 @@ index 8a43be523080..6fea43c513ac 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,174 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21001,9 +21196,10 @@ index 8a43be523080..6fea43c513ac 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 += [
@@ -21039,16 +21235,15 @@ index 8a43be523080..6fea43c513ac 100644
-
Library("call_gn")
diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index fa81c96c30ba..33d528c8825d 100644
+index fa81c96c30ba..811eabde6332 100644
--- third_party/libwebrtc/call/call_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -21064,7 +21259,7 @@ index fa81c96c30ba..33d528c8825d 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,174 +58,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21203,9 +21398,10 @@ index fa81c96c30ba..33d528c8825d 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 += [
@@ -21241,16 +21437,15 @@ index fa81c96c30ba..33d528c8825d 100644
-
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 6641aaf07204..5a4618b82753 100644
+index 6641aaf07204..e8dd8acc81b8 100644
--- third_party/libwebrtc/call/fake_network_gn/moz.build
+++ third_party/libwebrtc/call/fake_network_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -21266,7 +21461,7 @@ index 6641aaf07204..5a4618b82753 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21405,9 +21600,10 @@ index 6641aaf07204..5a4618b82753 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 += [
@@ -21443,16 +21639,15 @@ index 6641aaf07204..5a4618b82753 100644
-
Library("fake_network_gn")
diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index a7006906326a..f913641b55d8 100644
+index a7006906326a..3dc41cf90cd8 100644
--- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
+++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -21468,7 +21663,7 @@ index a7006906326a..f913641b55d8 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21603,9 +21798,10 @@ index a7006906326a..f913641b55d8 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 += [
@@ -21641,16 +21837,15 @@ index a7006906326a..f913641b55d8 100644
-
Library("receive_stream_interface_gn")
diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index 9a4504208de8..599ae400f88a 100644
+index 9a4504208de8..8de25ccf5453 100644
--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -21666,7 +21861,7 @@ index 9a4504208de8..599ae400f88a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21805,9 +22000,10 @@ index 9a4504208de8..599ae400f88a 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 += [
@@ -21843,16 +22039,15 @@ index 9a4504208de8..599ae400f88a 100644
-
Library("rtp_interfaces_gn")
diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index f245b8fe8a5f..214592c1a052 100644
+index f245b8fe8a5f..f57bb730b3c9 100644
--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -21868,7 +22063,7 @@ index f245b8fe8a5f..214592c1a052 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,174 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22007,9 +22202,10 @@ index f245b8fe8a5f..214592c1a052 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 += [
@@ -22045,16 +22241,15 @@ index f245b8fe8a5f..214592c1a052 100644
-
Library("rtp_receiver_gn")
diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index 56e1d8324603..0716a989b781 100644
+index 56e1d8324603..4f93f4988594 100644
--- third_party/libwebrtc/call/rtp_sender_gn/moz.build
+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -22070,7 +22265,7 @@ index 56e1d8324603..0716a989b781 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,174 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22209,9 +22404,10 @@ index 56e1d8324603..0716a989b781 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 += [
@@ -22247,16 +22443,15 @@ index 56e1d8324603..0716a989b781 100644
-
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 dc88d9e8c718..b7b1b59e6619 100644
+index dc88d9e8c718..0d858916f24b 100644
--- third_party/libwebrtc/call/simulated_network_gn/moz.build
+++ third_party/libwebrtc/call/simulated_network_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -22272,7 +22467,7 @@ index dc88d9e8c718..b7b1b59e6619 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22411,9 +22606,10 @@ index dc88d9e8c718..b7b1b59e6619 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 += [
@@ -22449,16 +22645,15 @@ index dc88d9e8c718..b7b1b59e6619 100644
-
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 08140f915b20..3a20a2f8d339 100644
+index 08140f915b20..46df12c957ef 100644
--- third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
+++ third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -22474,7 +22669,7 @@ index 08140f915b20..3a20a2f8d339 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22609,9 +22804,10 @@ index 08140f915b20..3a20a2f8d339 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 += [
@@ -22647,16 +22843,15 @@ index 08140f915b20..3a20a2f8d339 100644
-
Library("simulated_packet_receiver_gn")
diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index 6f82bc3c2801..660232b40a74 100644
+index 6f82bc3c2801..b0a2d081546a 100644
--- third_party/libwebrtc/call/version_gn/moz.build
+++ third_party/libwebrtc/call/version_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -22672,7 +22867,7 @@ index 6f82bc3c2801..660232b40a74 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22794,9 +22989,10 @@ index 6f82bc3c2801..660232b40a74 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 += [
@@ -22832,16 +23028,15 @@ index 6f82bc3c2801..660232b40a74 100644
-
Library("version_gn")
diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build
-index ee981f9452bc..1960a3cf8eba 100644
+index ee981f9452bc..162f225011f8 100644
--- third_party/libwebrtc/call/video_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -22857,7 +23052,7 @@ index ee981f9452bc..1960a3cf8eba 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,174 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22996,9 +23191,10 @@ index ee981f9452bc..1960a3cf8eba 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 += [
@@ -23034,16 +23230,15 @@ index ee981f9452bc..1960a3cf8eba 100644
-
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 df7f52b4c647..29cfd6953d92 100644
+index df7f52b4c647..4d14cdd35d47 100644
--- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-@@ -17,11 +17,21 @@ CXXFLAGS += [
+@@ -17,11 +17,20 @@ CXXFLAGS += [
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -23059,7 +23254,7 @@ index df7f52b4c647..29cfd6953d92 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,127 +58,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,127 +57,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23158,8 +23353,8 @@ index df7f52b4c647..29cfd6953d92 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
@@ -23170,16 +23365,17 @@ index df7f52b4c647..29cfd6953d92 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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -23188,16 +23384,15 @@ index df7f52b4c647..29cfd6953d92 100644
-
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 9a7a8fa7cc91..92f7cda914ec 100644
+index 9a7a8fa7cc91..263d4c990206 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -23213,7 +23408,7 @@ index 9a7a8fa7cc91..92f7cda914ec 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,158 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,158 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23336,9 +23531,10 @@ index 9a7a8fa7cc91..92f7cda914ec 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 += [
@@ -23374,16 +23570,15 @@ index 9a7a8fa7cc91..92f7cda914ec 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 625fcd103a7b..87a53a453c61 100644
+index 625fcd103a7b..b243ab2af3be 100644
--- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -23399,7 +23594,7 @@ index 625fcd103a7b..87a53a453c61 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,6 +48,7 @@ UNIFIED_SOURCES += [
+@@ -37,6 +47,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",
@@ -23407,7 +23602,7 @@ index 625fcd103a7b..87a53a453c61 100644
"/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",
-@@ -44,6 +56,7 @@ UNIFIED_SOURCES += [
+@@ -44,6 +55,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",
@@ -23415,7 +23610,7 @@ index 625fcd103a7b..87a53a453c61 100644
"/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",
-@@ -79,228 +92,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -79,228 +91,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23574,9 +23769,10 @@ index 625fcd103a7b..87a53a453c61 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- UNIFIED_SOURCES += [
@@ -23646,16 +23842,15 @@ index 625fcd103a7b..87a53a453c61 100644
-
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 241c8788eb2f..06a11d7294d5 100644
+index 241c8788eb2f..c2d49a2321a2 100644
--- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -23671,7 +23866,7 @@ index 241c8788eb2f..06a11d7294d5 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23808,9 +24003,10 @@ index 241c8788eb2f..06a11d7294d5 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 += [
@@ -23846,16 +24042,15 @@ index 241c8788eb2f..06a11d7294d5 100644
-
Library("common_audio_cc_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index d81fd8f09ca0..507236e0da49 100644
+index d81fd8f09ca0..ffb2fa21e12d 100644
--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -23871,7 +24066,7 @@ index d81fd8f09ca0..507236e0da49 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,172 +65,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,172 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24008,9 +24203,10 @@ index d81fd8f09ca0..507236e0da49 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 += [
@@ -24046,16 +24242,15 @@ index d81fd8f09ca0..507236e0da49 100644
-
Library("common_audio_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index 0bb21dcc6f81..e009c5e8817d 100644
+index 0bb21dcc6f81..97a4c56f1a5b 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
-@@ -12,12 +12,23 @@ 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_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_ARCH_ARM64"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24073,7 +24268,7 @@ index 0bb21dcc6f81..e009c5e8817d 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,148 +56,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"
@@ -24184,8 +24379,8 @@ index 0bb21dcc6f81..e009c5e8817d 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
@@ -24196,16 +24391,17 @@ index 0bb21dcc6f81..e009c5e8817d 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
@@ -24223,16 +24419,15 @@ index 0bb21dcc6f81..e009c5e8817d 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 05386adf23c5..046ba0c92bb5 100644
+index 05386adf23c5..30ffc38e65fd 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-@@ -12,12 +12,23 @@ 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_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_ARCH_ARM64"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24250,7 +24445,7 @@ index 05386adf23c5..046ba0c92bb5 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,148 +55,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,148 +54,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24361,8 +24556,8 @@ index 05386adf23c5..046ba0c92bb5 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
@@ -24373,16 +24568,17 @@ index 05386adf23c5..046ba0c92bb5 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
@@ -24400,10 +24596,10 @@ index 05386adf23c5..046ba0c92bb5 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 93daf376421d..24ab67834d8c 100644
+index 93daf376421d..40d8a4b08f17 100644
--- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-@@ -9,14 +9,28 @@
+@@ -9,14 +9,27 @@
COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
@@ -24416,7 +24612,6 @@ index 93daf376421d..24ab67834d8c 100644
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -24432,7 +24627,7 @@ index 93daf376421d..24ab67834d8c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,143 +57,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,143 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24555,20 +24750,21 @@ index 93daf376421d..24ab67834d8c 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"
-
-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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -24577,16 +24773,15 @@ index 93daf376421d..24ab67834d8c 100644
-
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 47f99dbd830c..577d8e343cd0 100644
+index 47f99dbd830c..93b9d78370f1 100644
--- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -24602,7 +24797,7 @@ index 47f99dbd830c..577d8e343cd0 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24739,9 +24934,10 @@ index 47f99dbd830c..577d8e343cd0 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 += [
@@ -24777,16 +24973,15 @@ index 47f99dbd830c..577d8e343cd0 100644
-
Library("fir_filter_factory_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index 51acac9bad1a..551f858eb730 100644
+index 51acac9bad1a..6ed17d2eb8dd 100644
--- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -24802,7 +24997,7 @@ index 51acac9bad1a..551f858eb730 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24920,9 +25115,10 @@ index 51acac9bad1a..551f858eb730 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 += [
@@ -24958,16 +25154,15 @@ index 51acac9bad1a..551f858eb730 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 b1047de5ccb2..b4b9a0cc7f2c 100644
+index b1047de5ccb2..128eb766d596 100644
--- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
+++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -24983,7 +25178,7 @@ index b1047de5ccb2..b4b9a0cc7f2c 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,168 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25116,9 +25311,10 @@ index b1047de5ccb2..b4b9a0cc7f2c 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 += [
@@ -25154,16 +25350,15 @@ index b1047de5ccb2..b4b9a0cc7f2c 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 142887be2aeb..9ab8a82e5635 100644
+index 142887be2aeb..24ac42fb0329 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -25179,7 +25374,7 @@ index 142887be2aeb..9ab8a82e5635 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,101 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,101 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25282,7 +25477,7 @@ index 142887be2aeb..9ab8a82e5635 100644
if CONFIG["CPU_ARCH"] == "aarch64":
-@@ -146,117 +63,24 @@ if CONFIG["CPU_ARCH"] == "aarch64":
+@@ -146,117 +62,28 @@ if CONFIG["CPU_ARCH"] == "aarch64":
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
]
@@ -25390,31 +25585,32 @@ index 142887be2aeb..9ab8a82e5635 100644
-
- CXXFLAGS += [
- "-msse2"
-- ]
--
++ UNIFIED_SOURCES += [
++ "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
+ ]
+
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
- DEFINES["_GNU_SOURCE"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "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 b007a1e5ed8d..6969bf473fdc 100644
+index b007a1e5ed8d..d6be72cf693c 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -25430,7 +25626,7 @@ index b007a1e5ed8d..6969bf473fdc 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25552,9 +25748,10 @@ index b007a1e5ed8d..6969bf473fdc 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 += [
@@ -25590,16 +25787,15 @@ index b007a1e5ed8d..6969bf473fdc 100644
-
Library("fft_size_256_gn")
diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index ec6e2eca861f..124349b86777 100644
+index ec6e2eca861f..7b51a5386c8d 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -25615,7 +25811,7 @@ index ec6e2eca861f..124349b86777 100644
FINAL_LIBRARY = "webrtc"
-@@ -28,6 +39,10 @@ LOCAL_INCLUDES += [
+@@ -28,6 +38,10 @@ LOCAL_INCLUDES += [
"/tools/profiler/public"
]
@@ -25626,7 +25822,7 @@ index ec6e2eca861f..124349b86777 100644
if not CONFIG["MOZ_DEBUG"]:
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -37,203 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,203 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25766,9 +25962,10 @@ index ec6e2eca861f..124349b86777 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- UNIFIED_SOURCES += [
@@ -25832,16 +26029,15 @@ index ec6e2eca861f..124349b86777 100644
-
Library("spl_sqrt_floor_gn")
diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 369cdc3ac64d..46ead4d5d4ef 100644
+index 369cdc3ac64d..8d71417aa908 100644
--- third_party/libwebrtc/common_video/common_video_gn/moz.build
+++ third_party/libwebrtc/common_video/common_video_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -25857,7 +26053,7 @@ index 369cdc3ac64d..46ead4d5d4ef 100644
FINAL_LIBRARY = "webrtc"
-@@ -55,174 +66,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,174 +65,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25996,9 +26192,10 @@ index 369cdc3ac64d..46ead4d5d4ef 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 += [
@@ -26034,16 +26231,15 @@ index 369cdc3ac64d..46ead4d5d4ef 100644
-
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 d1be405adf26..4eb0c496bccd 100644
+index d1be405adf26..1e284ffb51df 100644
--- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -26059,7 +26255,7 @@ index d1be405adf26..4eb0c496bccd 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26177,9 +26373,10 @@ index d1be405adf26..4eb0c496bccd 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 += [
@@ -26215,16 +26412,15 @@ index d1be405adf26..4eb0c496bccd 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 651826f452fe..f88d9cac7f12 100644
+index 651826f452fe..061cfc842908 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
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -26240,7 +26436,7 @@ index 651826f452fe..f88d9cac7f12 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26366,9 +26562,10 @@ index 651826f452fe..f88d9cac7f12 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 += [
@@ -26404,16 +26601,15 @@ index 651826f452fe..f88d9cac7f12 100644
-
Library("generic_frame_descriptor_gn")
diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index fc4a82d00bde..4aa2ca4d7166 100644
+index fc4a82d00bde..b06802646e84 100644
--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -26429,7 +26625,7 @@ index fc4a82d00bde..4aa2ca4d7166 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,165 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26559,9 +26755,10 @@ index fc4a82d00bde..4aa2ca4d7166 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 += [
@@ -26597,16 +26794,15 @@ index fc4a82d00bde..4aa2ca4d7166 100644
-
Library("rtc_event_audio_gn")
diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index 49e8f523ed87..d4c93774e6d4 100644
+index 49e8f523ed87..b41ba4eddf9e 100644
--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -26622,7 +26818,7 @@ index 49e8f523ed87..d4c93774e6d4 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,165 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,165 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26752,9 +26948,10 @@ index 49e8f523ed87..d4c93774e6d4 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 += [
@@ -26790,16 +26987,15 @@ index 49e8f523ed87..d4c93774e6d4 100644
-
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 0d6463867101..b926c0c00976 100644
+index 0d6463867101..292edf8bdf23 100644
--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -26815,7 +27011,7 @@ index 0d6463867101..b926c0c00976 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,165 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26945,9 +27141,10 @@ index 0d6463867101..b926c0c00976 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 += [
@@ -26983,16 +27180,15 @@ index 0d6463867101..b926c0c00976 100644
-
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 d6d86cdf23c4..e314022a3ba3 100644
+index d6d86cdf23c4..f652832a8a4d 100644
--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -27008,7 +27204,7 @@ index d6d86cdf23c4..e314022a3ba3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,161 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,161 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27134,9 +27330,10 @@ index d6d86cdf23c4..e314022a3ba3 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 += [
@@ -27172,16 +27369,15 @@ index d6d86cdf23c4..e314022a3ba3 100644
-
Library("rtc_event_number_encodings_gn")
diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index 985b84c85042..0e9a86243402 100644
+index 985b84c85042..b6028c696a8b 100644
--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -27197,7 +27393,7 @@ index 985b84c85042..0e9a86243402 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27327,9 +27523,10 @@ index 985b84c85042..0e9a86243402 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 += [
@@ -27365,16 +27562,15 @@ index 985b84c85042..0e9a86243402 100644
-
Library("rtc_event_pacing_gn")
diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index cc048c7fdad3..e672555dba88 100644
+index cc048c7fdad3..d0d8c7a098d1 100644
--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -27390,7 +27586,7 @@ index cc048c7fdad3..e672555dba88 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,174 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27529,9 +27725,10 @@ index cc048c7fdad3..e672555dba88 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 += [
@@ -27567,16 +27764,15 @@ index cc048c7fdad3..e672555dba88 100644
-
Library("rtc_event_rtp_rtcp_gn")
diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index b1758b72bf25..1ab9cfef0980 100644
+index b1758b72bf25..b65614c9846d 100644
--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -27592,7 +27788,7 @@ index b1758b72bf25..1ab9cfef0980 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27722,9 +27918,10 @@ index b1758b72bf25..1ab9cfef0980 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 += [
@@ -27760,16 +27957,15 @@ index b1758b72bf25..1ab9cfef0980 100644
-
Library("rtc_event_video_gn")
diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index 0273e154491a..3f8f8ff40db1 100644
+index 0273e154491a..7d67e8476b53 100644
--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -27785,7 +27981,7 @@ index 0273e154491a..3f8f8ff40db1 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27915,9 +28111,10 @@ index 0273e154491a..3f8f8ff40db1 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 += [
@@ -27953,16 +28150,15 @@ index 0273e154491a..3f8f8ff40db1 100644
-
Library("rtc_stream_config_gn")
diff --git third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
-index 9fd4c74381a6..0bf289f19734 100644
+index 9fd4c74381a6..4d2e584f2b12 100644
--- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
+++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -27978,7 +28174,7 @@ index 9fd4c74381a6..0bf289f19734 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28117,9 +28313,10 @@ index 9fd4c74381a6..0bf289f19734 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 += [
@@ -28155,16 +28352,15 @@ index 9fd4c74381a6..0bf289f19734 100644
-
Library("rtc_encoder_simulcast_proxy_gn")
diff --git third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-index 09893f4183f6..9426f2f5de0b 100644
+index 09893f4183f6..c32a7bbe84b4 100644
--- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
+++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -28180,7 +28376,7 @@ index 09893f4183f6..9426f2f5de0b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,174 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28319,9 +28515,10 @@ index 09893f4183f6..9426f2f5de0b 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 += [
@@ -28357,16 +28554,15 @@ index 09893f4183f6..9426f2f5de0b 100644
-
Library("rtc_internal_video_codecs_gn")
diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index b9b963ad03b1..58f590077722 100644
+index b9b963ad03b1..63d1adfc9f3f 100644
--- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -28382,7 +28578,7 @@ index b9b963ad03b1..58f590077722 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,174 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28521,9 +28717,10 @@ index b9b963ad03b1..58f590077722 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 += [
@@ -28559,16 +28756,15 @@ index b9b963ad03b1..58f590077722 100644
-
Library("rtc_media_base_gn")
diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index b3e48563c04d..c8b9d001a4db 100644
+index b3e48563c04d..85b15dbdb123 100644
--- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -28584,7 +28780,7 @@ index b3e48563c04d..c8b9d001a4db 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28702,9 +28898,10 @@ index b3e48563c04d..c8b9d001a4db 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 += [
@@ -28740,16 +28937,15 @@ index b3e48563c04d..c8b9d001a4db 100644
-
Library("rtc_media_config_gn")
diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index 1bc62c2080fa..2dadff8ad499 100644
+index 1bc62c2080fa..f3ccbadd37d0 100644
--- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -28765,7 +28961,7 @@ index 1bc62c2080fa..2dadff8ad499 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28904,9 +29100,10 @@ index 1bc62c2080fa..2dadff8ad499 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 += [
@@ -28942,16 +29139,15 @@ index 1bc62c2080fa..2dadff8ad499 100644
-
Library("rtc_simulcast_encoder_adapter_gn")
diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-index 24f8656db097..8a2d5df6f165 100644
+index 24f8656db097..b5761737772d 100644
--- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -28967,7 +29163,7 @@ index 24f8656db097..8a2d5df6f165 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29097,9 +29293,10 @@ index 24f8656db097..8a2d5df6f165 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 += [
@@ -29135,16 +29332,15 @@ index 24f8656db097..8a2d5df6f165 100644
-
Library("async_audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index 3d193a4a3437..fb71f8f1db78 100644
+index 3d193a4a3437..2c9f1c45b3ec 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -29160,7 +29356,7 @@ index 3d193a4a3437..fb71f8f1db78 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,172 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,172 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29297,9 +29493,10 @@ index 3d193a4a3437..fb71f8f1db78 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 += [
@@ -29335,16 +29532,15 @@ index 3d193a4a3437..fb71f8f1db78 100644
-
Library("audio_coding_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index 9f3c0d8abda1..abd687397461 100644
+index 9f3c0d8abda1..846f9f907e72 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -29360,7 +29556,7 @@ index 9f3c0d8abda1..abd687397461 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29478,9 +29674,10 @@ index 9f3c0d8abda1..abd687397461 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 += [
@@ -29516,16 +29713,15 @@ index 9f3c0d8abda1..abd687397461 100644
-
Library("audio_coding_module_typedefs_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index 132dbaad9bef..cadf99f321ea 100644
+index 132dbaad9bef..c1648ebdc6da 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -29541,7 +29737,7 @@ index 132dbaad9bef..cadf99f321ea 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29671,9 +29867,10 @@ index 132dbaad9bef..cadf99f321ea 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 += [
@@ -29709,16 +29906,15 @@ index 132dbaad9bef..cadf99f321ea 100644
-
Library("audio_coding_opus_common_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index 725d37c02703..3158295adb12 100644
+index 725d37c02703..f3ae48b25ffb 100644
--- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -29734,7 +29930,7 @@ index 725d37c02703..3158295adb12 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29871,9 +30067,10 @@ index 725d37c02703..3158295adb12 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 += [
@@ -29909,16 +30106,15 @@ index 725d37c02703..3158295adb12 100644
-
Library("audio_encoder_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index 7ef11d489203..eb0acc486f51 100644
+index 7ef11d489203..cf3f1f338ba0 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -29934,7 +30130,7 @@ index 7ef11d489203..eb0acc486f51 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30056,9 +30252,10 @@ index 7ef11d489203..eb0acc486f51 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 += [
@@ -30094,16 +30291,15 @@ index 7ef11d489203..eb0acc486f51 100644
-
Library("audio_network_adaptor_config_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index b65fc49e5237..fd4522b58147 100644
+index b65fc49e5237..1a504c38fce1 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -30119,7 +30315,7 @@ index b65fc49e5237..fd4522b58147 100644
FINAL_LIBRARY = "webrtc"
-@@ -51,172 +62,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,172 +61,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30256,9 +30452,10 @@ index b65fc49e5237..fd4522b58147 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 += [
@@ -30294,16 +30491,15 @@ index b65fc49e5237..fd4522b58147 100644
-
Library("audio_network_adaptor_gn")
diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-index 15764353c966..0b20f3f7b2f0 100644
+index 15764353c966..e9ed99aad0a1 100644
--- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -30319,7 +30515,7 @@ index 15764353c966..0b20f3f7b2f0 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30456,9 +30652,10 @@ index 15764353c966..0b20f3f7b2f0 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 += [
@@ -30494,16 +30691,15 @@ index 15764353c966..0b20f3f7b2f0 100644
-
Library("default_neteq_factory_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index ea97f94f457d..8dde74b758bf 100644
+index ea97f94f457d..3feac0906041 100644
--- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -30519,7 +30715,7 @@ index ea97f94f457d..8dde74b758bf 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30641,9 +30837,10 @@ index ea97f94f457d..8dde74b758bf 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 += [
@@ -30679,16 +30876,15 @@ index ea97f94f457d..8dde74b758bf 100644
-
Library("g711_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index 80fb9807c16f..9eed564e8b4b 100644
+index 80fb9807c16f..88b940e9c6c3 100644
--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -30704,7 +30900,7 @@ index 80fb9807c16f..9eed564e8b4b 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30834,9 +31030,10 @@ index 80fb9807c16f..9eed564e8b4b 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 += [
@@ -30872,16 +31069,15 @@ index 80fb9807c16f..9eed564e8b4b 100644
-
Library("g711_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index 87571de3048e..4ee43530b130 100644
+index 87571de3048e..6af30071257f 100644
--- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -30897,7 +31093,7 @@ index 87571de3048e..4ee43530b130 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31019,9 +31215,10 @@ index 87571de3048e..4ee43530b130 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 += [
@@ -31057,16 +31254,15 @@ index 87571de3048e..4ee43530b130 100644
-
Library("g722_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index be80bff2213e..3ee46e8b6c6c 100644
+index be80bff2213e..8d9f37d48283 100644
--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -31082,7 +31278,7 @@ index be80bff2213e..3ee46e8b6c6c 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31212,9 +31408,10 @@ index be80bff2213e..3ee46e8b6c6c 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 += [
@@ -31250,16 +31447,15 @@ index be80bff2213e..3ee46e8b6c6c 100644
-
Library("g722_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-index 771a415b58fe..c203e65a3dc0 100644
+index 771a415b58fe..64ca7ca1f4fc 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -31275,7 +31471,7 @@ index 771a415b58fe..c203e65a3dc0 100644
FINAL_LIBRARY = "webrtc"
-@@ -109,172 +120,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -109,172 +119,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31412,9 +31608,10 @@ index 771a415b58fe..c203e65a3dc0 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 += [
@@ -31450,16 +31647,15 @@ index 771a415b58fe..c203e65a3dc0 100644
-
Library("ilbc_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-index a652760054da..f39d09f90cdf 100644
+index a652760054da..4927afb7d7e6 100644
--- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -31475,7 +31671,7 @@ index a652760054da..f39d09f90cdf 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31612,9 +31808,10 @@ index a652760054da..f39d09f90cdf 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 += [
@@ -31650,16 +31847,15 @@ index a652760054da..f39d09f90cdf 100644
-
Library("ilbc_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index 1cf433ded05c..21bdaef4a784 100644
+index 1cf433ded05c..17649824103d 100644
--- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -31675,7 +31871,7 @@ index 1cf433ded05c..21bdaef4a784 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31793,9 +31989,10 @@ index 1cf433ded05c..21bdaef4a784 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 += [
@@ -31831,16 +32028,15 @@ index 1cf433ded05c..21bdaef4a784 100644
-
Library("isac_bwinfo_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
-index 09da7ad6738f..f4675489b9a0 100644
+index 09da7ad6738f..9028bcf4b2b6 100644
--- third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -31856,7 +32052,7 @@ index 09da7ad6738f..f4675489b9a0 100644
FINAL_LIBRARY = "webrtc"
-@@ -63,151 +74,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -63,151 +73,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31984,9 +32180,10 @@ index 09da7ad6738f..f4675489b9a0 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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -32010,16 +32207,15 @@ index 09da7ad6738f..f4675489b9a0 100644
-
Library("isac_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
-index bdc092498c84..ed67060046ce 100644
+index bdc092498c84..17c7236ffe82 100644
--- third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_common_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -32035,7 +32231,7 @@ index bdc092498c84..ed67060046ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32161,9 +32357,10 @@ index bdc092498c84..ed67060046ce 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 += [
@@ -32198,17 +32395,433 @@ index bdc092498c84..ed67060046ce 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("isac_common_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn/moz.build
+deleted file mode 100644
+index 2e44cd30b17e..000000000000
+--- third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn/moz.build
++++ /dev/null
+@@ -1,89 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-SOURCES += [
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "log",
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+-
+- OS_LIBS += [
+- "rt"
+- ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("isac_fix_c_arm_asm_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn/moz.build
+deleted file mode 100644
+index ad5cffa07f76..000000000000
+--- third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn/moz.build
++++ /dev/null
+@@ -1,118 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CFLAGS += [
+- "-mfpu=neon"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-SOURCES += [
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines_hist.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/arith_routines_logist.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/decode.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/decode_bwe.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/encode.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/filters.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/initialize.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/transform.c"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "log",
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+-
+- OS_LIBS += [
+- "rt"
+- ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("isac_fix_c_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn/moz.build
+deleted file mode 100644
+index bbb4268d355c..000000000000
+--- third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn/moz.build
++++ /dev/null
+@@ -1,93 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CFLAGS += [
+- "-mfpu=neon"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/fft.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/transform_tables.c"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "log",
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+-
+- OS_LIBS += [
+- "rt"
+- ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("isac_fix_common_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/isac_fix_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_fix_gn/moz.build
+deleted file mode 100644
+index afe4e88ce197..000000000000
+--- third_party/libwebrtc/modules/audio_coding/isac_fix_gn/moz.build
++++ /dev/null
+@@ -1,93 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-CXXFLAGS += [
+- "-mfpu=neon"
+-]
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/audio_decoder_isacfix.cc",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "log",
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+-
+- OS_LIBS += [
+- "rt"
+- ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("isac_fix_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
-index 5e75a5ca4ff8..bf532178a419 100644
+index 5e75a5ca4ff8..3426e6b4d6c6 100644
--- third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -32224,7 +32837,7 @@ index 5e75a5ca4ff8..bf532178a419 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,151 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,151 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32352,9 +32965,10 @@ index 5e75a5ca4ff8..bf532178a419 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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -32377,17 +32991,118 @@ index 5e75a5ca4ff8..bf532178a419 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("isac_gn")
+diff --git third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build
+deleted file mode 100644
+index d260776887bf..000000000000
+--- third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build
++++ /dev/null
+@@ -1,96 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-CFLAGS += [
+- "-mfpu=neon"
+-]
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ARCH_ARM"] = True
+-DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_HAS_NEON"] = True
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_neon.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/filters_neon.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/lattice_neon.c",
+- "/third_party/libwebrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.c"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+- DEFINES["ANDROID"] = True
+- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+- DEFINES["HAVE_SYS_UIO_H"] = True
+- DEFINES["WEBRTC_ANDROID"] = True
+- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "log",
+- "unwind"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_AURA"] = "1"
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_NSS_CERTS"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_UDEV"] = True
+- DEFINES["_FILE_OFFSET_BITS"] = "64"
+- DEFINES["_LARGEFILE64_SOURCE"] = True
+- DEFINES["_LARGEFILE_SOURCE"] = True
+-
+- OS_LIBS += [
+- "rt"
+- ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["USE_X11"] = "1"
+-
+-Library("isac_neon_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index 2769ce21ffca..99dd3eae93b9 100644
+index 2769ce21ffca..33b4dbcde38f 100644
--- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -32403,7 +33118,7 @@ index 2769ce21ffca..99dd3eae93b9 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,157 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,157 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32525,9 +33240,10 @@ index 2769ce21ffca..99dd3eae93b9 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 += [
@@ -32563,16 +33279,15 @@ index 2769ce21ffca..99dd3eae93b9 100644
-
Library("isac_vad_gn")
diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index 81572e410402..acce38c1e55b 100644
+index 81572e410402..59bbb7146249 100644
--- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -32588,7 +33303,7 @@ index 81572e410402..acce38c1e55b 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32718,9 +33433,10 @@ index 81572e410402..acce38c1e55b 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 += [
@@ -32756,16 +33472,15 @@ index 81572e410402..acce38c1e55b 100644
-
Library("legacy_encoded_audio_frame_gn")
diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-index 50f2227c0bd7..38f16a4b69fd 100644
+index 50f2227c0bd7..baa80fe26989 100644
--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -32781,7 +33496,7 @@ index 50f2227c0bd7..38f16a4b69fd 100644
FINAL_LIBRARY = "webrtc"
-@@ -76,172 +87,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -76,172 +86,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32918,9 +33633,10 @@ index 50f2227c0bd7..38f16a4b69fd 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 += [
@@ -32956,16 +33672,15 @@ index 50f2227c0bd7..38f16a4b69fd 100644
-
Library("neteq_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index 4828d70c9e23..d8ba20b86d5a 100644
+index 4828d70c9e23..7190eb22b813 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -32981,7 +33696,7 @@ index 4828d70c9e23..d8ba20b86d5a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33103,9 +33818,10 @@ index 4828d70c9e23..d8ba20b86d5a 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 += [
@@ -33141,16 +33857,15 @@ index 4828d70c9e23..d8ba20b86d5a 100644
-
Library("pcm16b_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index be33178a5cab..f066383a7ec2 100644
+index be33178a5cab..89f2de84107b 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -33166,7 +33881,7 @@ index be33178a5cab..f066383a7ec2 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,165 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,165 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33296,9 +34011,10 @@ index be33178a5cab..f066383a7ec2 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 += [
@@ -33334,16 +34050,15 @@ index be33178a5cab..f066383a7ec2 100644
-
Library("pcm16b_gn")
diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index 8b44f5f5edb7..5a1de4ad8b41 100644
+index 8b44f5f5edb7..c49e1b3e083d 100644
--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -33359,7 +34074,7 @@ index 8b44f5f5edb7..5a1de4ad8b41 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33496,9 +34211,10 @@ index 8b44f5f5edb7..5a1de4ad8b41 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 += [
@@ -33534,16 +34250,15 @@ index 8b44f5f5edb7..5a1de4ad8b41 100644
-
Library("red_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index 8ff29da0a21b..6c4ed3fb29a6 100644
+index 8ff29da0a21b..89de01b4ab03 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -33559,7 +34274,7 @@ index 8ff29da0a21b..6c4ed3fb29a6 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33696,9 +34411,10 @@ index 8ff29da0a21b..6c4ed3fb29a6 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 += [
@@ -33734,16 +34450,15 @@ index 8ff29da0a21b..6c4ed3fb29a6 100644
-
Library("webrtc_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index ba2537bee593..ca3019ed9573 100644
+index ba2537bee593..cc3840777570 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-@@ -12,13 +12,25 @@ AllowCompilerWarnings()
+@@ -12,13 +12,24 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_CODEC_ILBC"] = True
+DEFINES["WEBRTC_CODEC_ISAC"] = True
@@ -33763,7 +34478,7 @@ index ba2537bee593..ca3019ed9573 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,186 +58,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,186 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33901,9 +34616,10 @@ index ba2537bee593..ca3019ed9573 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_CODEC_ISAC"] = True
@@ -33952,16 +34668,15 @@ index ba2537bee593..ca3019ed9573 100644
-
Library("webrtc_multiopus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index 214294646eb4..9c5d57a2797c 100644
+index 214294646eb4..e9e8cb129053 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-@@ -12,13 +12,25 @@ AllowCompilerWarnings()
+@@ -12,13 +12,24 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_CODEC_ILBC"] = True
+DEFINES["WEBRTC_CODEC_ISAC"] = True
@@ -33981,7 +34696,7 @@ index 214294646eb4..9c5d57a2797c 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,193 +58,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,193 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34126,9 +34841,10 @@ index 214294646eb4..9c5d57a2797c 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_CODEC_ISAC"] = True
@@ -34177,16 +34893,15 @@ index 214294646eb4..9c5d57a2797c 100644
-
Library("webrtc_opus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index 5a26300ac81a..8cc707232a4c 100644
+index 5a26300ac81a..3bbddabdfdf2 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-@@ -12,13 +12,25 @@ AllowCompilerWarnings()
+@@ -12,13 +12,24 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_CODEC_ILBC"] = True
+DEFINES["WEBRTC_CODEC_ISAC"] = True
@@ -34206,7 +34921,7 @@ index 5a26300ac81a..8cc707232a4c 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,186 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34344,9 +35059,10 @@ index 5a26300ac81a..8cc707232a4c 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_CODEC_ISAC"] = True
@@ -34395,16 +35111,15 @@ index 5a26300ac81a..8cc707232a4c 100644
-
Library("webrtc_opus_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
-index 5daa3d21332b..f03274d49d87 100644
+index 5daa3d21332b..0e4605d56d31 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -34420,7 +35135,7 @@ index 5daa3d21332b..f03274d49d87 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34542,9 +35257,10 @@ index 5daa3d21332b..f03274d49d87 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 += [
@@ -34580,16 +35296,15 @@ index 5daa3d21332b..f03274d49d87 100644
-
Library("audio_device_api_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
-index 30a6f5a256ac..d3d9856aa0c8 100644
+index 30a6f5a256ac..0fc29d8e9af1 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -34605,7 +35320,7 @@ index 30a6f5a256ac..d3d9856aa0c8 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34742,9 +35457,10 @@ index 30a6f5a256ac..d3d9856aa0c8 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 += [
@@ -34780,16 +35496,15 @@ index 30a6f5a256ac..d3d9856aa0c8 100644
-
Library("audio_device_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
-index c8db0272c603..a6964314a62f 100644
+index c8db0272c603..9a67c799ec06 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -34805,7 +35520,7 @@ index c8db0272c603..a6964314a62f 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34927,9 +35642,10 @@ index c8db0272c603..a6964314a62f 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 += [
@@ -34965,16 +35681,15 @@ index c8db0272c603..a6964314a62f 100644
-
Library("audio_device_default_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
-index cb0ddf1b0519..96efb9ed67a8 100644
+index cb0ddf1b0519..d4bb4133fdc5 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_generic_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -34990,7 +35705,7 @@ index cb0ddf1b0519..96efb9ed67a8 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35127,9 +35842,10 @@ index cb0ddf1b0519..96efb9ed67a8 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 += [
@@ -35165,16 +35881,15 @@ index cb0ddf1b0519..96efb9ed67a8 100644
-
Library("audio_device_generic_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index b4d28288199d..618ee92dcf78 100644
+index b4d28288199d..6338124838c4 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -35190,7 +35905,7 @@ index b4d28288199d..618ee92dcf78 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35325,9 +36040,10 @@ index b4d28288199d..618ee92dcf78 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 += [
@@ -35363,16 +36079,15 @@ index b4d28288199d..618ee92dcf78 100644
-
Library("audio_device_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-index 0d8c6863e4d5..cf51b085a168 100644
+index 0d8c6863e4d5..bfb50c8f3d3d 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_DUMMY_AUDIO_BUILD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -35389,7 +36104,7 @@ index 0d8c6863e4d5..cf51b085a168 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,174 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35528,9 +36243,10 @@ index 0d8c6863e4d5..cf51b085a168 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 += [
@@ -35566,16 +36282,15 @@ index 0d8c6863e4d5..cf51b085a168 100644
-
Library("audio_device_impl_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index 79dbb7b153df..b28c6523ee5a 100644
+index 79dbb7b153df..d764aed0dd02 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -35591,7 +36306,7 @@ index 79dbb7b153df..b28c6523ee5a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35728,9 +36443,10 @@ index 79dbb7b153df..b28c6523ee5a 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 += [
@@ -35766,16 +36482,15 @@ index 79dbb7b153df..b28c6523ee5a 100644
-
Library("audio_frame_manipulator_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index 1e88321d5391..d5eb40c12e51 100644
+index 1e88321d5391..a8ae00324854 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -35792,7 +36507,7 @@ index 1e88321d5391..d5eb40c12e51 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,172 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,172 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35929,9 +36644,10 @@ index 1e88321d5391..d5eb40c12e51 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 += [
@@ -35967,16 +36683,15 @@ index 1e88321d5391..d5eb40c12e51 100644
-
Library("audio_mixer_impl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index c7dd6c5d6015..579638d5c53d 100644
+index c7dd6c5d6015..617cc748feda 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -35992,7 +36707,7 @@ index c7dd6c5d6015..579638d5c53d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36114,9 +36829,10 @@ index c7dd6c5d6015..579638d5c53d 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 += [
@@ -36152,16 +36868,15 @@ index c7dd6c5d6015..579638d5c53d 100644
-
Library("adaptive_fir_filter_erl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index 2129bf155256..3f254972cc2c 100644
+index 2129bf155256..a941096e4afc 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -36177,7 +36892,7 @@ index 2129bf155256..3f254972cc2c 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,168 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36310,9 +37025,10 @@ index 2129bf155256..3f254972cc2c 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 += [
@@ -36348,16 +37064,15 @@ index 2129bf155256..3f254972cc2c 100644
-
Library("adaptive_fir_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index 23ed46452f56..f0d558afaf9b 100644
+index 23ed46452f56..f574927b9086 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-@@ -17,12 +17,22 @@ 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_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36374,7 +37089,7 @@ index 23ed46452f56..f0d558afaf9b 100644
FINAL_LIBRARY = "webrtc"
-@@ -52,127 +62,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,127 +61,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36473,8 +37188,8 @@ index 23ed46452f56..f0d558afaf9b 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
@@ -36485,16 +37200,17 @@ index 23ed46452f56..f0d558afaf9b 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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -36503,16 +37219,15 @@ index 23ed46452f56..f0d558afaf9b 100644
-
Library("aec3_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index 4e67aab28be6..efa86603916f 100644
+index 4e67aab28be6..f90a5fd65293 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -36528,7 +37243,7 @@ index 4e67aab28be6..efa86603916f 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36646,9 +37361,10 @@ index 4e67aab28be6..efa86603916f 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 += [
@@ -36684,16 +37400,15 @@ index 4e67aab28be6..efa86603916f 100644
-
Library("aec3_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index 114f48807640..85ea5c091e9f 100644
+index 114f48807640..a2d2f9a5b406 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -36709,7 +37424,7 @@ index 114f48807640..85ea5c091e9f 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,168 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36842,9 +37557,10 @@ index 114f48807640..85ea5c091e9f 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 += [
@@ -36880,16 +37596,15 @@ index 114f48807640..85ea5c091e9f 100644
-
Library("aec3_fft_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index 571aae8a6ae4..d4d4110a81c9 100644
+index 571aae8a6ae4..42694b5523dd 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36906,7 +37621,7 @@ index 571aae8a6ae4..d4d4110a81c9 100644
FINAL_LIBRARY = "webrtc"
-@@ -98,172 +109,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -98,172 +108,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37043,9 +37758,10 @@ index 571aae8a6ae4..d4d4110a81c9 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 += [
@@ -37081,16 +37797,15 @@ index 571aae8a6ae4..d4d4110a81c9 100644
-
Library("aec3_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index bf921e36ad77..6d4393c3d4d2 100644
+index bf921e36ad77..42c8c46bb886 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -37106,7 +37821,7 @@ index bf921e36ad77..6d4393c3d4d2 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37228,9 +37943,10 @@ index bf921e36ad77..6d4393c3d4d2 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 += [
@@ -37266,16 +37982,15 @@ index bf921e36ad77..6d4393c3d4d2 100644
-
Library("fft_data_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index 0892a4f3f36e..b38e951a884a 100644
+index 0892a4f3f36e..d9a7dcc1ebeb 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -37291,7 +38006,7 @@ index 0892a4f3f36e..b38e951a884a 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37413,9 +38128,10 @@ index 0892a4f3f36e..b38e951a884a 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 += [
@@ -37451,16 +38167,15 @@ index 0892a4f3f36e..b38e951a884a 100644
-
Library("matched_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index 8d679eb2bd65..385f5fc28d87 100644
+index 8d679eb2bd65..064a74ce9804 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -37476,7 +38191,7 @@ index 8d679eb2bd65..385f5fc28d87 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37598,9 +38313,10 @@ index 8d679eb2bd65..385f5fc28d87 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 += [
@@ -37636,16 +38352,15 @@ index 8d679eb2bd65..385f5fc28d87 100644
-
Library("render_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index 873539f6ece5..4e1e7b0db0b5 100644
+index 873539f6ece5..4990982ddaa3 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -37661,7 +38376,7 @@ index 873539f6ece5..4e1e7b0db0b5 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37783,9 +38498,10 @@ index 873539f6ece5..4e1e7b0db0b5 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 += [
@@ -37821,16 +38537,15 @@ index 873539f6ece5..4e1e7b0db0b5 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index a16f58d5d063..d9c6550a6a44 100644
+index a16f58d5d063..c6481f850097 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -37846,7 +38561,7 @@ index a16f58d5d063..d9c6550a6a44 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37972,9 +38687,10 @@ index a16f58d5d063..d9c6550a6a44 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 += [
@@ -38010,16 +38726,15 @@ index a16f58d5d063..d9c6550a6a44 100644
-
Library("aec_dump_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index ff1c21af1f7c..77a14d9680b3 100644
+index ff1c21af1f7c..60c269e3a27f 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -38035,7 +38750,7 @@ index ff1c21af1f7c..77a14d9680b3 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38165,9 +38880,10 @@ index ff1c21af1f7c..77a14d9680b3 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 += [
@@ -38203,16 +38919,15 @@ index ff1c21af1f7c..77a14d9680b3 100644
-
Library("null_aec_dump_factory_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 96883bf5ab5a..00ad1610d93f 100644
+index 96883bf5ab5a..cd5350094992 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -38228,7 +38943,7 @@ index 96883bf5ab5a..00ad1610d93f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38358,9 +39073,10 @@ index 96883bf5ab5a..00ad1610d93f 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 += [
@@ -38396,16 +39112,15 @@ index 96883bf5ab5a..00ad1610d93f 100644
-
Library("aec_dump_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index aec034200408..face13268100 100644
+index aec034200408..0631062f15c8 100644
--- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -38421,7 +39136,7 @@ index aec034200408..face13268100 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,101 +54,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,101 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38524,7 +39239,7 @@ index aec034200408..face13268100 100644
if CONFIG["CPU_ARCH"] == "aarch64":
-@@ -148,75 +65,4 @@ if CONFIG["CPU_ARCH"] == "aarch64":
+@@ -148,75 +64,8 @@ if CONFIG["CPU_ARCH"] == "aarch64":
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc"
]
@@ -38563,9 +39278,10 @@ index aec034200408..face13268100 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 += [
@@ -38601,16 +39317,15 @@ index aec034200408..face13268100 100644
-
Library("aecm_core_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index f64fb947d36d..4fbfa5becfdb 100644
+index f64fb947d36d..1314242cfefa 100644
--- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38627,7 +39342,7 @@ index f64fb947d36d..4fbfa5becfdb 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38764,9 +39479,10 @@ index f64fb947d36d..4fbfa5becfdb 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 += [
@@ -38802,16 +39518,15 @@ index f64fb947d36d..4fbfa5becfdb 100644
-
Library("agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/analog_gain_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/analog_gain_stats_reporter_gn/moz.build
-index 63f69dc9db3c..5fe96b7ccb56 100644
+index 63f69dc9db3c..62474a6f0d47 100644
--- third_party/libwebrtc/modules/audio_processing/agc/analog_gain_stats_reporter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/analog_gain_stats_reporter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -38827,7 +39542,7 @@ index 63f69dc9db3c..5fe96b7ccb56 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38957,9 +39672,10 @@ index 63f69dc9db3c..5fe96b7ccb56 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 += [
@@ -38995,16 +39711,15 @@ index 63f69dc9db3c..5fe96b7ccb56 100644
-
Library("analog_gain_stats_reporter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_evaluator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_evaluator_gn/moz.build
-index f5acc34bc313..4197e532415e 100644
+index f5acc34bc313..6f105f8471c6 100644
--- third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_evaluator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_evaluator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39020,7 +39735,7 @@ index f5acc34bc313..4197e532415e 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39150,9 +39865,10 @@ index f5acc34bc313..4197e532415e 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 += [
@@ -39188,16 +39904,15 @@ index f5acc34bc313..4197e532415e 100644
-
Library("clipping_predictor_evaluator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_gn/moz.build
-index fbbf08b2b49d..63f1b677ad03 100644
+index fbbf08b2b49d..5678f3c1cb08 100644
--- third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39213,7 +39928,7 @@ index fbbf08b2b49d..63f1b677ad03 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39350,9 +40065,10 @@ index fbbf08b2b49d..63f1b677ad03 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 += [
@@ -39388,16 +40104,15 @@ index fbbf08b2b49d..63f1b677ad03 100644
-
Library("clipping_predictor_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_level_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_level_buffer_gn/moz.build
-index e99a2d6c2107..5e76dd087615 100644
+index e99a2d6c2107..c160ca81143c 100644
--- third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_level_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/clipping_predictor_level_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39413,7 +40128,7 @@ index e99a2d6c2107..5e76dd087615 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39543,9 +40258,10 @@ index e99a2d6c2107..5e76dd087615 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 += [
@@ -39581,16 +40297,15 @@ index e99a2d6c2107..5e76dd087615 100644
-
Library("clipping_predictor_level_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index 95ab1e2252c9..5204e533dc09 100644
+index 95ab1e2252c9..2a57aa2aee53 100644
--- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39606,7 +40321,7 @@ index 95ab1e2252c9..5204e533dc09 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39724,9 +40439,10 @@ index 95ab1e2252c9..5204e533dc09 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 += [
@@ -39762,16 +40478,15 @@ index 95ab1e2252c9..5204e533dc09 100644
-
Library("gain_control_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build
-index 1cbd4cc29bb7..9f34c3c1fedb 100644
+index 1cbd4cc29bb7..0e0c971225d7 100644
--- third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/gain_map_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39787,7 +40502,7 @@ index 1cbd4cc29bb7..9f34c3c1fedb 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39905,9 +40620,10 @@ index 1cbd4cc29bb7..9f34c3c1fedb 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 += [
@@ -39943,16 +40659,15 @@ index 1cbd4cc29bb7..9f34c3c1fedb 100644
-
Library("gain_map_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index a9b1ddd0ce05..01f544c20978 100644
+index a9b1ddd0ce05..72a7c778d48d 100644
--- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -39968,7 +40683,7 @@ index a9b1ddd0ce05..01f544c20978 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40105,9 +40820,10 @@ index a9b1ddd0ce05..01f544c20978 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 += [
@@ -40143,16 +40859,15 @@ index a9b1ddd0ce05..01f544c20978 100644
-
Library("legacy_agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index c4bdd7c93d49..bb8ac8b36ecb 100644
+index c4bdd7c93d49..e9c087851ff9 100644
--- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -40168,7 +40883,7 @@ index c4bdd7c93d49..bb8ac8b36ecb 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,172 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,172 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40305,9 +41020,10 @@ index c4bdd7c93d49..bb8ac8b36ecb 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 += [
@@ -40343,16 +41059,15 @@ index c4bdd7c93d49..bb8ac8b36ecb 100644
-
Library("level_estimation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
-index 26182baa247a..758f216a4b12 100644
+index 26182baa247a..ebc2211e5b0d 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40369,7 +41084,7 @@ index 26182baa247a..758f216a4b12 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,172 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,172 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40506,9 +41221,10 @@ index 26182baa247a..758f216a4b12 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 += [
@@ -40544,16 +41260,15 @@ index 26182baa247a..758f216a4b12 100644
-
Library("adaptive_digital_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index ec66966c7ef8..793cdbabbed7 100644
+index ec66966c7ef8..d8249c8fab67 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -40569,7 +41284,7 @@ index ec66966c7ef8..793cdbabbed7 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40695,9 +41410,10 @@ index ec66966c7ef8..793cdbabbed7 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 += [
@@ -40733,16 +41449,15 @@ index ec66966c7ef8..793cdbabbed7 100644
-
Library("biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index 9d239a6c3d86..5464ee85902d 100644
+index 9d239a6c3d86..c96c60556739 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -40758,7 +41473,7 @@ index 9d239a6c3d86..5464ee85902d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40876,9 +41591,10 @@ index 9d239a6c3d86..5464ee85902d 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 += [
@@ -40914,16 +41630,15 @@ index 9d239a6c3d86..5464ee85902d 100644
-
Library("common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-index 53d944473426..4ccd4a5ffb21 100644
+index 53d944473426..c1cdc754f015 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -40939,7 +41654,7 @@ index 53d944473426..4ccd4a5ffb21 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41076,9 +41791,10 @@ index 53d944473426..4ccd4a5ffb21 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 += [
@@ -41114,16 +41830,15 @@ index 53d944473426..4ccd4a5ffb21 100644
-
Library("cpu_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index 3e7668851ca6..da0d1d56bdb8 100644
+index 3e7668851ca6..b4e32c2f8c59 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41140,7 +41855,7 @@ index 3e7668851ca6..da0d1d56bdb8 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,172 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,172 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41277,9 +41992,10 @@ index 3e7668851ca6..da0d1d56bdb8 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 += [
@@ -41315,16 +42031,15 @@ index 3e7668851ca6..da0d1d56bdb8 100644
-
Library("fixed_digital_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index 1e7fc30e597b..618b7231fcac 100644
+index 1e7fc30e597b..cae583abe0d5 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -41340,7 +42055,7 @@ index 1e7fc30e597b..618b7231fcac 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41466,9 +42181,10 @@ index 1e7fc30e597b..618b7231fcac 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 += [
@@ -41504,16 +42220,15 @@ index 1e7fc30e597b..618b7231fcac 100644
-
Library("gain_applier_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index 6b53dda825e1..11dcf1c4ff27 100644
+index 6b53dda825e1..83fb77a28255 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -41530,7 +42245,7 @@ index 6b53dda825e1..11dcf1c4ff27 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41667,9 +42382,10 @@ index 6b53dda825e1..11dcf1c4ff27 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 += [
@@ -41705,16 +42421,15 @@ index 6b53dda825e1..11dcf1c4ff27 100644
-
Library("noise_level_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-index 1e156ad9575b..e933cc5c553e 100644
+index 1e156ad9575b..185e659784c8 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -41730,7 +42445,7 @@ index 1e156ad9575b..e933cc5c553e 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41867,9 +42582,10 @@ index 1e156ad9575b..e933cc5c553e 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 += [
@@ -41905,16 +42621,15 @@ index 1e156ad9575b..e933cc5c553e 100644
-
Library("rnn_vad_auto_correlation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-index 3bb95f79791c..7cc29e8fdc81 100644
+index 3bb95f79791c..6daadea362fa 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -41930,7 +42645,7 @@ index 3bb95f79791c..7cc29e8fdc81 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,168 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42063,9 +42778,10 @@ index 3bb95f79791c..7cc29e8fdc81 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 += [
@@ -42101,16 +42817,15 @@ index 3bb95f79791c..7cc29e8fdc81 100644
-
Library("rnn_vad_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index 26fa033b1623..935e775b10e6 100644
+index 26fa033b1623..a10c2251c804 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -42126,7 +42841,7 @@ index 26fa033b1623..935e775b10e6 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42263,9 +42978,10 @@ index 26fa033b1623..935e775b10e6 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 += [
@@ -42301,16 +43017,15 @@ index 26fa033b1623..935e775b10e6 100644
-
Library("rnn_vad_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-index 9bac4ab5e9d1..5e21f7ca161e 100644
+index 9bac4ab5e9d1..0087abfe4dcc 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -42326,7 +43041,7 @@ index 9bac4ab5e9d1..5e21f7ca161e 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42463,9 +43178,10 @@ index 9bac4ab5e9d1..5e21f7ca161e 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 += [
@@ -42501,16 +43217,15 @@ index 9bac4ab5e9d1..5e21f7ca161e 100644
-
Library("rnn_vad_layers_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-index 19e87379fac3..94412ed5e833 100644
+index 19e87379fac3..a08fc7140c80 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -42526,7 +43241,7 @@ index 19e87379fac3..94412ed5e833 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42652,9 +43367,10 @@ index 19e87379fac3..94412ed5e833 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 += [
@@ -42690,16 +43406,15 @@ index 19e87379fac3..94412ed5e833 100644
-
Library("rnn_vad_lp_residual_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-index 4d648421174e..ad1db892f76a 100644
+index 4d648421174e..29b2de4834b3 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -42715,7 +43430,7 @@ index 4d648421174e..ad1db892f76a 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42852,9 +43567,10 @@ index 4d648421174e..ad1db892f76a 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 += [
@@ -42890,16 +43606,15 @@ index 4d648421174e..ad1db892f76a 100644
-
Library("rnn_vad_pitch_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-index cc26a37594a5..76b30f615072 100644
+index cc26a37594a5..b23fb1614730 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -42915,7 +43630,7 @@ index cc26a37594a5..76b30f615072 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43037,9 +43752,10 @@ index cc26a37594a5..76b30f615072 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 += [
@@ -43075,16 +43791,15 @@ index cc26a37594a5..76b30f615072 100644
-
Library("rnn_vad_ring_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-index 874bdcaab7c0..5945b4e6f34d 100644
+index 874bdcaab7c0..2d330c87602b 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -43100,7 +43815,7 @@ index 874bdcaab7c0..5945b4e6f34d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43222,9 +43937,10 @@ index 874bdcaab7c0..5945b4e6f34d 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 += [
@@ -43260,16 +43976,15 @@ index 874bdcaab7c0..5945b4e6f34d 100644
-
Library("rnn_vad_sequence_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-index 1cdba1b49734..a585084de951 100644
+index 1cdba1b49734..30e44361141d 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -43285,7 +44000,7 @@ index 1cdba1b49734..a585084de951 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43422,9 +44137,10 @@ index 1cdba1b49734..a585084de951 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 += [
@@ -43460,16 +44176,15 @@ index 1cdba1b49734..a585084de951 100644
-
Library("rnn_vad_spectral_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-index e92fb28f2725..aef00220fe3b 100644
+index e92fb28f2725..0268e80c43a0 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -43485,7 +44200,7 @@ index e92fb28f2725..aef00220fe3b 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43607,9 +44322,10 @@ index e92fb28f2725..aef00220fe3b 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 += [
@@ -43645,16 +44361,15 @@ index e92fb28f2725..aef00220fe3b 100644
-
Library("rnn_vad_symmetric_matrix_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-index a640c1993a32..3026d746621d 100644
+index a640c1993a32..aa65d1d05815 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-@@ -17,11 +17,21 @@ CXXFLAGS += [
+@@ -17,11 +17,20 @@ CXXFLAGS += [
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -43670,7 +44385,7 @@ index a640c1993a32..3026d746621d 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,127 +57,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,127 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43769,8 +44484,8 @@ index a640c1993a32..3026d746621d 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
@@ -43781,16 +44496,17 @@ index a640c1993a32..3026d746621d 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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -43799,16 +44515,15 @@ index a640c1993a32..3026d746621d 100644
-
Library("vector_math_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-index f3e853fd556d..4e1e7b0db0b5 100644
+index f3e853fd556d..4990982ddaa3 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -43824,7 +44539,7 @@ index f3e853fd556d..4e1e7b0db0b5 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,168 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43957,9 +44672,10 @@ index f3e853fd556d..4e1e7b0db0b5 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 += [
@@ -43995,16 +44711,15 @@ index f3e853fd556d..4e1e7b0db0b5 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-index 30e1f281640c..c19fc3176803 100644
+index 30e1f281640c..f1a2634651cf 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -44020,7 +44735,7 @@ index 30e1f281640c..c19fc3176803 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44157,9 +44872,10 @@ index 30e1f281640c..c19fc3176803 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 += [
@@ -44195,16 +44911,15 @@ index 30e1f281640c..c19fc3176803 100644
-
Library("vad_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-index eb8d4aaa2ccd..1cf2ddf324d8 100644
+index eb8d4aaa2ccd..e5b149d36db2 100644
--- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -44220,7 +44935,7 @@ index eb8d4aaa2ccd..1cf2ddf324d8 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44350,9 +45065,10 @@ index eb8d4aaa2ccd..1cf2ddf324d8 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 += [
@@ -44388,16 +45104,15 @@ index eb8d4aaa2ccd..1cf2ddf324d8 100644
-
Library("api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index 555f8dcf74fd..f925e79dd1b9 100644
+index 555f8dcf74fd..9adbe123f540 100644
--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44414,7 +45129,7 @@ index 555f8dcf74fd..f925e79dd1b9 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44551,9 +45266,10 @@ index 555f8dcf74fd..f925e79dd1b9 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 += [
@@ -44589,16 +45305,15 @@ index 555f8dcf74fd..f925e79dd1b9 100644
-
Library("apm_logging_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index e642368635a0..51c2f16e98ca 100644
+index e642368635a0..a2068838de7e 100644
--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44615,7 +45330,7 @@ index e642368635a0..51c2f16e98ca 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,172 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,172 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44752,9 +45467,10 @@ index e642368635a0..51c2f16e98ca 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 += [
@@ -44790,16 +45506,15 @@ index e642368635a0..51c2f16e98ca 100644
-
Library("audio_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index 5485891626da..6efc3574c0b8 100644
+index 5485891626da..2d7a6bba30ef 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -44815,7 +45530,7 @@ index 5485891626da..6efc3574c0b8 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44945,9 +45660,10 @@ index 5485891626da..6efc3574c0b8 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 += [
@@ -44983,16 +45699,15 @@ index 5485891626da..6efc3574c0b8 100644
-
Library("audio_frame_proxies_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index 970deab9df7a..a5da1f8f59c1 100644
+index 970deab9df7a..a6a5af066fd4 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -45008,7 +45723,7 @@ index 970deab9df7a..a5da1f8f59c1 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45130,9 +45845,10 @@ index 970deab9df7a..a5da1f8f59c1 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 += [
@@ -45168,16 +45884,15 @@ index 970deab9df7a..a5da1f8f59c1 100644
-
Library("audio_frame_view_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index 0e55763c2110..bd40aac80376 100644
+index 0e55763c2110..b90e291c2946 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45194,7 +45909,7 @@ index 0e55763c2110..bd40aac80376 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,172 +59,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,172 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45331,9 +46046,10 @@ index 0e55763c2110..bd40aac80376 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 += [
@@ -45369,16 +46085,15 @@ index 0e55763c2110..bd40aac80376 100644
-
Library("audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-index 94464762645b..c8821c1e6e0c 100644
+index 94464762645b..f79f9b47102e 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -45394,7 +46109,7 @@ index 94464762645b..c8821c1e6e0c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45516,9 +46231,10 @@ index 94464762645b..c8821c1e6e0c 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 += [
@@ -45554,16 +46270,15 @@ index 94464762645b..c8821c1e6e0c 100644
-
Library("audio_processing_statistics_gn")
diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-index ded0d721d512..005bd1f7e6c4 100644
+index ded0d721d512..8d188c0c67cc 100644
--- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -45579,7 +46294,7 @@ index ded0d721d512..005bd1f7e6c4 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45716,9 +46431,10 @@ index ded0d721d512..005bd1f7e6c4 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 += [
@@ -45754,16 +46470,15 @@ index ded0d721d512..005bd1f7e6c4 100644
-
Library("capture_levels_adjuster_gn")
diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-index b63751c50154..8f8295a405ce 100644
+index b63751c50154..fbeb02505d23 100644
--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45780,7 +46495,7 @@ index b63751c50154..8f8295a405ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45917,9 +46632,10 @@ index b63751c50154..8f8295a405ce 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 += [
@@ -45955,16 +46671,15 @@ index b63751c50154..8f8295a405ce 100644
-
Library("gain_controller2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index ca00a03c1dcf..d340e94e386f 100644
+index ca00a03c1dcf..517ab3444e18 100644
--- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -45980,7 +46695,7 @@ index ca00a03c1dcf..d340e94e386f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46117,9 +46832,10 @@ index ca00a03c1dcf..d340e94e386f 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 += [
@@ -46155,16 +46871,15 @@ index ca00a03c1dcf..d340e94e386f 100644
-
Library("high_pass_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index d83a789b5c2c..c9fdb10e7277 100644
+index d83a789b5c2c..bc9dc5849b93 100644
--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46181,7 +46896,7 @@ index d83a789b5c2c..c9fdb10e7277 100644
FINAL_LIBRARY = "webrtc"
-@@ -54,172 +65,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,172 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46318,9 +47033,10 @@ index d83a789b5c2c..c9fdb10e7277 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 += [
@@ -46356,16 +47072,15 @@ index d83a789b5c2c..c9fdb10e7277 100644
-
Library("ns_gn")
diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-index b32a08b8bcf7..c5491a23e8e3 100644
+index b32a08b8bcf7..c7daad766244 100644
--- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -46381,7 +47096,7 @@ index b32a08b8bcf7..c5491a23e8e3 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46518,9 +47233,10 @@ index b32a08b8bcf7..c5491a23e8e3 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 += [
@@ -46556,16 +47272,15 @@ index b32a08b8bcf7..c5491a23e8e3 100644
-
Library("optionally_built_submodule_creators_gn")
diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index cb54ed67d588..659bda0bb9c4 100644
+index cb54ed67d588..8c507163a7f5 100644
--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -46581,7 +47296,7 @@ index cb54ed67d588..659bda0bb9c4 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46707,9 +47422,10 @@ index cb54ed67d588..659bda0bb9c4 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 += [
@@ -46745,16 +47461,15 @@ index cb54ed67d588..659bda0bb9c4 100644
-
Library("rms_level_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
-index 24dda8592205..1036855955f2 100644
+index 24dda8592205..e965dab96cde 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -46770,7 +47485,7 @@ index 24dda8592205..1036855955f2 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46888,9 +47603,10 @@ index 24dda8592205..1036855955f2 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 += [
@@ -46926,16 +47642,15 @@ index 24dda8592205..1036855955f2 100644
-
Library("transient_suppressor_api_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-index b7f5a0e97114..b45387dfa0d3 100644
+index b7f5a0e97114..a2416ce436e9 100644
--- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -46951,7 +47666,7 @@ index b7f5a0e97114..b45387dfa0d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,172 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,172 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47088,9 +47803,10 @@ index b7f5a0e97114..b45387dfa0d3 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 += [
@@ -47126,16 +47842,15 @@ index b7f5a0e97114..b45387dfa0d3 100644
-
Library("transient_suppressor_impl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
-index 61917bc8c3ad..a4714621c984 100644
+index 61917bc8c3ad..c8efd07b8a3d 100644
--- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -47151,7 +47866,7 @@ index 61917bc8c3ad..a4714621c984 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47277,9 +47992,10 @@ index 61917bc8c3ad..a4714621c984 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 += [
@@ -47315,16 +48031,15 @@ index 61917bc8c3ad..a4714621c984 100644
-
Library("voice_probability_delay_unit_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index 9147ecb214cf..b7e63a3ed0c5 100644
+index 9147ecb214cf..e8f8e96423b1 100644
--- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -47340,7 +48055,7 @@ index 9147ecb214cf..b7e63a3ed0c5 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47466,9 +48181,10 @@ index 9147ecb214cf..b7e63a3ed0c5 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 += [
@@ -47504,16 +48220,15 @@ index 9147ecb214cf..b7e63a3ed0c5 100644
-
Library("cascaded_biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index 2df791788aff..f1ced31449dd 100644
+index 2df791788aff..8b12d37b5e30 100644
--- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -47529,7 +48244,7 @@ index 2df791788aff..f1ced31449dd 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,161 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,161 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47655,9 +48370,10 @@ index 2df791788aff..f1ced31449dd 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 += [
@@ -47693,16 +48409,15 @@ index 2df791788aff..f1ced31449dd 100644
-
Library("legacy_delay_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index 9ecfbdf7f9cb..20a29e57af7c 100644
+index 9ecfbdf7f9cb..e56bb33ca7e9 100644
--- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -47718,7 +48433,7 @@ index 9ecfbdf7f9cb..20a29e57af7c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47844,9 +48559,10 @@ index 9ecfbdf7f9cb..20a29e57af7c 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 += [
@@ -47882,16 +48598,15 @@ index 9ecfbdf7f9cb..20a29e57af7c 100644
-
Library("pffft_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index 8c94a1281f94..a905ee2dbdfa 100644
+index 8c94a1281f94..b469a1c790c7 100644
--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -47907,7 +48622,7 @@ index 8c94a1281f94..a905ee2dbdfa 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,172 +59,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,172 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48044,9 +48759,10 @@ index 8c94a1281f94..a905ee2dbdfa 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 += [
@@ -48082,16 +48798,15 @@ index 8c94a1281f94..a905ee2dbdfa 100644
-
Library("vad_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index 17ab56bb0ef0..38b73b5f795a 100644
+index 17ab56bb0ef0..32083cc21884 100644
--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -48107,7 +48822,7 @@ index 17ab56bb0ef0..38b73b5f795a 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,174 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48246,9 +48961,10 @@ index 17ab56bb0ef0..38b73b5f795a 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 += [
@@ -48284,16 +49000,15 @@ index 17ab56bb0ef0..38b73b5f795a 100644
-
Library("congestion_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index 622fd6f57c94..cd007c101df7 100644
+index 622fd6f57c94..f0386334b4a1 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -48309,7 +49024,7 @@ index 622fd6f57c94..cd007c101df7 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48439,9 +49154,10 @@ index 622fd6f57c94..cd007c101df7 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 += [
@@ -48477,16 +49193,15 @@ index 622fd6f57c94..cd007c101df7 100644
-
Library("alr_detector_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index ac2e6ec0c550..c78d6167d7b0 100644
+index ac2e6ec0c550..3ee3ac184ffc 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -48502,7 +49217,7 @@ index ac2e6ec0c550..c78d6167d7b0 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,174 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48641,9 +49356,10 @@ index ac2e6ec0c550..c78d6167d7b0 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 += [
@@ -48679,16 +49395,15 @@ index ac2e6ec0c550..c78d6167d7b0 100644
-
Library("delay_based_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index c2bee724dd5d..5eda0f697f94 100644
+index c2bee724dd5d..92b066b8825e 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -48704,7 +49419,7 @@ index c2bee724dd5d..5eda0f697f94 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,174 +58,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48843,9 +49558,10 @@ index c2bee724dd5d..5eda0f697f94 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 += [
@@ -48881,16 +49597,15 @@ index c2bee724dd5d..5eda0f697f94 100644
-
Library("estimators_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index ea12fe5d8f18..91d09e3a4017 100644
+index ea12fe5d8f18..9a53fcdb371a 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -48906,7 +49621,7 @@ index ea12fe5d8f18..91d09e3a4017 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,174 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49045,9 +49760,10 @@ index ea12fe5d8f18..91d09e3a4017 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 += [
@@ -49083,16 +49799,15 @@ index ea12fe5d8f18..91d09e3a4017 100644
-
Library("goog_cc_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index b153a0e3545b..88cd730c9c43 100644
+index b153a0e3545b..7877c2d41539 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -49108,7 +49823,7 @@ index b153a0e3545b..88cd730c9c43 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49234,9 +49949,10 @@ index b153a0e3545b..88cd730c9c43 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 += [
@@ -49272,16 +49988,15 @@ index b153a0e3545b..88cd730c9c43 100644
-
Library("link_capacity_estimator_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
-index e3394c942051..9518965db01c 100644
+index e3394c942051..31a345962883 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -49297,7 +50012,7 @@ index e3394c942051..9518965db01c 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49427,9 +50142,10 @@ index e3394c942051..9518965db01c 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 += [
@@ -49465,16 +50181,15 @@ index e3394c942051..9518965db01c 100644
-
Library("loss_based_bwe_v1_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index 4064872b725e..afd4380c4322 100644
+index 4064872b725e..4560734ac334 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -49490,7 +50205,7 @@ index 4064872b725e..afd4380c4322 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49629,9 +50344,10 @@ index 4064872b725e..afd4380c4322 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 += [
@@ -49667,16 +50383,15 @@ index 4064872b725e..afd4380c4322 100644
-
Library("loss_based_bwe_v2_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index e337176f2165..4a80bbeace2c 100644
+index e337176f2165..7846458c2ba7 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -49692,7 +50407,7 @@ index e337176f2165..4a80bbeace2c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49822,9 +50537,10 @@ index e337176f2165..4a80bbeace2c 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 += [
@@ -49860,16 +50576,15 @@ index e337176f2165..4a80bbeace2c 100644
-
Library("probe_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index b7b66731706b..46cfd4cdbd9f 100644
+index b7b66731706b..955762f4f4e9 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -49885,7 +50600,7 @@ index b7b66731706b..46cfd4cdbd9f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50015,9 +50730,10 @@ index b7b66731706b..46cfd4cdbd9f 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 += [
@@ -50053,16 +50769,15 @@ index b7b66731706b..46cfd4cdbd9f 100644
-
Library("pushback_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-index 742df43bbb7b..53206782a2ab 100644
+index 742df43bbb7b..a8b9df15c673 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -50078,7 +50793,7 @@ index 742df43bbb7b..53206782a2ab 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,174 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50217,9 +50932,10 @@ index 742df43bbb7b..53206782a2ab 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 += [
@@ -50255,16 +50971,15 @@ index 742df43bbb7b..53206782a2ab 100644
-
Library("send_side_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index b81ef2d22af8..12575224f4c9 100644
+index b81ef2d22af8..f5e8378c39d3 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -50280,7 +50995,7 @@ index b81ef2d22af8..12575224f4c9 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50419,9 +51134,10 @@ index b81ef2d22af8..12575224f4c9 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 += [
@@ -50457,16 +51173,15 @@ index b81ef2d22af8..12575224f4c9 100644
-
Library("control_handler_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index b4d2de8176da..1cd5ae1831b4 100644
+index b4d2de8176da..4bdb06502a73 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -50482,7 +51197,7 @@ index b4d2de8176da..1cd5ae1831b4 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,174 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50621,9 +51336,10 @@ index b4d2de8176da..1cd5ae1831b4 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 += [
@@ -50659,10 +51375,10 @@ index b4d2de8176da..1cd5ae1831b4 100644
-
Library("transport_feedback_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-index 1d9b39c90ee9..b4f574f80dac 100644
+index 1d9b39c90ee9..df973d1d6465 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-@@ -9,14 +9,28 @@
+@@ -9,14 +9,27 @@
COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
@@ -50675,7 +51391,6 @@ index 1d9b39c90ee9..b4f574f80dac 100644
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -50691,7 +51406,7 @@ index 1d9b39c90ee9..b4f574f80dac 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,101 +56,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,100 +55,9 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50774,36 +51489,35 @@ index 1d9b39c90ee9..b4f574f80dac 100644
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
-- DEFINES["_DEBUG"] = True
--
+ DEFINES["_DEBUG"] = True
+
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
- Library("desktop_capture_differ_sse2_gn")
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-index 809899a92847..9f0d79dfe40a 100644
+index 809899a92847..329aa27afaf0 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-@@ -14,10 +14,22 @@ AllowCompilerWarnings()
+@@ -14,10 +14,20 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -50811,7 +51525,6 @@ index 809899a92847..9f0d79dfe40a 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
-+DEFINES["WEBRTC_USE_X11"] = True
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -50820,53 +51533,12 @@ index 809899a92847..9f0d79dfe40a 100644
FINAL_LIBRARY = "webrtc"
-@@ -33,6 +45,17 @@ LOCAL_INCLUDES += [
- "/tools/profiler/public"
- ]
-
-+OS_LIBS += [
-+ "X11",
-+ "Xcomposite",
-+ "Xdamage",
-+ "Xext",
-+ "Xfixes",
-+ "Xrandr",
-+ "Xrender",
-+ "Xtst"
-+]
-+
- UNIFIED_SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc",
- "/third_party/libwebrtc/modules/desktop_capture/cropped_desktop_frame.cc",
-@@ -50,10 +73,23 @@ UNIFIED_SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc",
- "/third_party/libwebrtc/modules/desktop_capture/full_screen_application_handler.cc",
- "/third_party/libwebrtc/modules/desktop_capture/full_screen_window_detector.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc",
- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/resolution_tracker.cc",
- "/third_party/libwebrtc/modules/desktop_capture/rgba_color.cc",
- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_helper.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc",
-+ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_finder.cc"
- ]
-
-@@ -66,372 +102,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -66,63 +76,25 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
++ DEFINES["_DEBUG"] = True
+
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50884,7 +51556,8 @@ index 809899a92847..9f0d79dfe40a 100644
- ]
-
-if CONFIG["OS_TARGET"] == "Linux":
--
++if CONFIG["CPU_ARCH"] == "aarch64":
+
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_NSS_CERTS"] = "1"
@@ -50897,60 +51570,46 @@ index 809899a92847..9f0d79dfe40a 100644
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
--
++ DEFINES["WEBRTC_ARCH_ARM64"] = True
++ DEFINES["WEBRTC_HAS_NEON"] = True
+
- OS_LIBS += [
- "dl",
- "rt"
- ]
--
-- UNIFIED_SOURCES += [
++if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ UNIFIED_SOURCES += [
- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc"
-- ]
--
++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_null.cc",
++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_null.cc",
++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_null.cc"
+ ]
+
-if CONFIG["OS_TARGET"] == "OpenBSD":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
-- DEFINES["USE_X11"] = "1"
+ DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["WEBRTC_USE_X11"] = True
+ DEFINES["WEBRTC_USE_X11"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
--
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
--
-- UNIFIED_SOURCES += [
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc",
-- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc"
-- ]
--
+
+ OS_LIBS += [
+ "X11",
+@@ -151,287 +123,4 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
+ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc"
+ ]
+
-if CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
@@ -51020,13 +51679,12 @@ index 809899a92847..9f0d79dfe40a 100644
- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_win.cc",
- "/third_party/libwebrtc/modules/desktop_capture/window_finder_win.cc"
- ]
-+ DEFINES["_DEBUG"] = True
-
- if CONFIG["CPU_ARCH"] == "aarch64":
-
- 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
+-
-if CONFIG["CPU_ARCH"] == "arm":
-
- CXXFLAGS += [
@@ -51237,16 +51895,15 @@ index 809899a92847..9f0d79dfe40a 100644
-
Library("desktop_capture_generic_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-index 0c90f71d76bc..f1a6a6f391c5 100644
+index 0c90f71d76bc..3c1d109d7338 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-@@ -12,10 +12,22 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -51254,7 +51911,6 @@ index 0c90f71d76bc..f1a6a6f391c5 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
-+DEFINES["WEBRTC_USE_X11"] = True
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -51263,25 +51919,7 @@ index 0c90f71d76bc..f1a6a6f391c5 100644
FINAL_LIBRARY = "webrtc"
-@@ -28,6 +40,17 @@ LOCAL_INCLUDES += [
- "/tools/profiler/public"
- ]
-
-+OS_LIBS += [
-+ "X11",
-+ "Xcomposite",
-+ "Xdamage",
-+ "Xext",
-+ "Xfixes",
-+ "Xrandr",
-+ "Xrender",
-+ "Xtst"
-+]
-+
- if not CONFIG["MOZ_DEBUG"]:
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -37,221 +60,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,208 +47,14 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51488,33 +52126,94 @@ index 0c90f71d76bc..f1a6a6f391c5 100644
- ]
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+ DEFINES["WEBRTC_USE_X11"] = True
+diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
+deleted file mode 100644
+index e6788f779eb4..000000000000
+--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
++++ /dev/null
+@@ -1,68 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_MAC"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/sdk/objc/",
+- "/third_party/libwebrtc/sdk/objc/base/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_configuration.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_cgimage.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_iosurface.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/desktop_frame_provider.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_mac.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_darwin.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/window_capturer_mac.mm",
+- "/third_party/libwebrtc/modules/desktop_capture/window_finder_mac.mm"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
-
-- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_USE_X11"] = True
--
-- OS_LIBS += [
-- "X11",
-- "Xcomposite",
-- "Xdamage",
-- "Xext",
-- "Xfixes",
-- "Xrandr",
-- "Xrender",
-- "Xtst"
-- ]
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
-
- Library("desktop_capture_gn")
+-Library("desktop_capture_objc_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-index c0ef33e2b342..ef94c5618765 100644
+index c0ef33e2b342..01dae095db30 100644
--- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -51530,7 +52229,7 @@ index c0ef33e2b342..ef94c5618765 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,139 +58,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,138 +57,14 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51667,21 +52366,20 @@ index c0ef33e2b342..ef94c5618765 100644
- DEFINES["USE_X11"] = "1"
-
-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
- Library("primitives_gn")
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index 9cb0e4d6203a..67f95c502d97 100644
+index 9cb0e4d6203a..320177a15a95 100644
--- third_party/libwebrtc/modules/module_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -51697,7 +52395,7 @@ index 9cb0e4d6203a..67f95c502d97 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51815,9 +52513,10 @@ index 9cb0e4d6203a..67f95c502d97 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 += [
@@ -51853,16 +52552,15 @@ index 9cb0e4d6203a..67f95c502d97 100644
-
Library("module_api_gn")
diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index 03b9f6c4e5e6..eff30a99ec72 100644
+index 03b9f6c4e5e6..4100fd966dea 100644
--- third_party/libwebrtc/modules/module_api_public_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -51878,7 +52576,7 @@ index 03b9f6c4e5e6..eff30a99ec72 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51996,9 +52694,10 @@ index 03b9f6c4e5e6..eff30a99ec72 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 += [
@@ -52034,16 +52733,15 @@ index 03b9f6c4e5e6..eff30a99ec72 100644
-
Library("module_api_public_gn")
diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index 4c59791a1007..1a2785d141bf 100644
+index 4c59791a1007..12fac51de819 100644
--- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -52059,7 +52757,7 @@ index 4c59791a1007..1a2785d141bf 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52177,9 +52875,10 @@ index 4c59791a1007..1a2785d141bf 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 += [
@@ -52215,16 +52914,15 @@ index 4c59791a1007..1a2785d141bf 100644
-
Library("module_fec_api_gn")
diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index f03ff5ebcd21..69e70c8cea1c 100644
+index f03ff5ebcd21..e7500b1da54a 100644
--- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -52240,7 +52938,7 @@ index f03ff5ebcd21..69e70c8cea1c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52366,9 +53064,10 @@ index f03ff5ebcd21..69e70c8cea1c 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 += [
@@ -52404,16 +53103,15 @@ index f03ff5ebcd21..69e70c8cea1c 100644
-
Library("interval_budget_gn")
diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index d899917672bd..322fd0bc32da 100644
+index d899917672bd..e7a8d4dd1960 100644
--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -52429,7 +53127,7 @@ index d899917672bd..322fd0bc32da 100644
FINAL_LIBRARY = "webrtc"
-@@ -50,174 +61,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,174 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52568,9 +53266,10 @@ index d899917672bd..322fd0bc32da 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 += [
@@ -52606,16 +53305,15 @@ index d899917672bd..322fd0bc32da 100644
-
Library("pacing_gn")
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-index 7af9c5fc0071..0b848ac9248c 100644
+index 7af9c5fc0071..c4b2d55b1a59 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -52631,7 +53329,7 @@ index 7af9c5fc0071..0b848ac9248c 100644
FINAL_LIBRARY = "webrtc"
-@@ -53,174 +64,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,174 +63,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52770,9 +53468,10 @@ index 7af9c5fc0071..0b848ac9248c 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 += [
@@ -52808,16 +53507,15 @@ index 7af9c5fc0071..0b848ac9248c 100644
-
Library("remote_bitrate_estimator_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-index 800b7ccea105..8c4cea95b2f0 100644
+index 800b7ccea105..f5f609138c1e 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -52833,7 +53531,7 @@ index 800b7ccea105..8c4cea95b2f0 100644
FINAL_LIBRARY = "webrtc"
-@@ -84,174 +95,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -84,174 +94,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52972,9 +53670,10 @@ index 800b7ccea105..8c4cea95b2f0 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 += [
@@ -53010,16 +53709,15 @@ index 800b7ccea105..8c4cea95b2f0 100644
-
Library("rtp_rtcp_format_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index 4e7d516d4b7f..1820a2553f31 100644
+index 4e7d516d4b7f..bb1a3d90307d 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-@@ -13,10 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -53035,7 +53733,7 @@ index 4e7d516d4b7f..1820a2553f31 100644
FINAL_LIBRARY = "webrtc"
-@@ -93,174 +104,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -93,174 +103,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53174,9 +53872,10 @@ index 4e7d516d4b7f..1820a2553f31 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 += [
@@ -53212,16 +53911,15 @@ index 4e7d516d4b7f..1820a2553f31 100644
-
Library("rtp_rtcp_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index 7bb5cb10cee9..7089ce206ec5 100644
+index 7bb5cb10cee9..f2555eb6396b 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -53237,7 +53935,7 @@ index 7bb5cb10cee9..7089ce206ec5 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53367,9 +54065,10 @@ index 7bb5cb10cee9..7089ce206ec5 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 += [
@@ -53405,16 +54104,15 @@ index 7bb5cb10cee9..7089ce206ec5 100644
-
Library("rtp_video_header_gn")
diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index f03573036511..9cf131d08650 100644
+index f03573036511..1f2604f215ba 100644
--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -53430,7 +54128,7 @@ index f03573036511..9cf131d08650 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53552,9 +54250,10 @@ index f03573036511..9cf131d08650 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 += [
@@ -53590,16 +54289,15 @@ index f03573036511..9cf131d08650 100644
-
Library("fft_gn")
diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index 240656c0f3f0..5d6682806930 100644
+index 240656c0f3f0..a30888bae720 100644
--- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -53615,7 +54313,7 @@ index 240656c0f3f0..5d6682806930 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53737,9 +54435,10 @@ index 240656c0f3f0..5d6682806930 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 += [
@@ -53775,16 +54474,15 @@ index 240656c0f3f0..5d6682806930 100644
-
Library("g711_3p_gn")
diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index 3657b2cbe0f6..bd149373c70c 100644
+index 3657b2cbe0f6..af48f581b06c 100644
--- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -53800,7 +54498,7 @@ index 3657b2cbe0f6..bd149373c70c 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,157 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,157 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53922,9 +54620,10 @@ index 3657b2cbe0f6..bd149373c70c 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 += [
@@ -53960,16 +54659,15 @@ index 3657b2cbe0f6..bd149373c70c 100644
-
Library("g722_3p_gn")
diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index 12447a421204..faf3b58993d7 100644
+index 12447a421204..4cf06f7309d6 100644
--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -53985,7 +54683,7 @@ index 12447a421204..faf3b58993d7 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,177 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,177 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54127,9 +54825,10 @@ index 12447a421204..faf3b58993d7 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 += [
@@ -54165,16 +54864,15 @@ index 12447a421204..faf3b58993d7 100644
-
Library("utility_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index d7b98c3a7818..f38883c72a88 100644
+index d7b98c3a7818..3fcb8eb39e05 100644
--- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
+++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -54190,7 +54888,7 @@ index d7b98c3a7818..f38883c72a88 100644
FINAL_LIBRARY = "webrtc"
-@@ -28,6 +39,13 @@ LOCAL_INCLUDES += [
+@@ -28,6 +38,13 @@ LOCAL_INCLUDES += [
"/tools/profiler/public"
]
@@ -54204,7 +54902,7 @@ index d7b98c3a7818..f38883c72a88 100644
if not CONFIG["MOZ_DEBUG"]:
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-@@ -37,203 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,203 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54368,9 +55066,10 @@ index d7b98c3a7818..f38883c72a88 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 += [
@@ -54410,16 +55109,15 @@ index d7b98c3a7818..f38883c72a88 100644
-
Library("video_capture_internal_impl_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-index 4cad010d6416..3ba67692b899 100644
+index 4cad010d6416..62b8f59f4920 100644
--- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
+++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -54435,7 +55133,7 @@ index 4cad010d6416..3ba67692b899 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,174 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54574,9 +55272,10 @@ index 4cad010d6416..3ba67692b899 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 += [
@@ -54612,16 +55311,15 @@ index 4cad010d6416..3ba67692b899 100644
-
Library("video_capture_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index 09766af69824..0f09612052a3 100644
+index 09766af69824..d381a8730b53 100644
--- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -54637,7 +55335,7 @@ index 09766af69824..0f09612052a3 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54767,9 +55465,10 @@ index 09766af69824..0f09612052a3 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 += [
@@ -54805,16 +55504,15 @@ index 09766af69824..0f09612052a3 100644
-
Library("chain_diff_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index d4d71bf7fb4a..22303d11dc04 100644
+index d4d71bf7fb4a..7abada72701b 100644
--- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -54830,7 +55528,7 @@ index d4d71bf7fb4a..22303d11dc04 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54952,9 +55650,10 @@ index d4d71bf7fb4a..22303d11dc04 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 += [
@@ -54990,16 +55689,15 @@ index d4d71bf7fb4a..22303d11dc04 100644
-
Library("codec_globals_headers_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-index f3bef360d869..7b285e93ae73 100644
+index f3bef360d869..5cd53c990b1f 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -55015,7 +55713,7 @@ index f3bef360d869..7b285e93ae73 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55145,9 +55843,10 @@ index f3bef360d869..7b285e93ae73 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 += [
@@ -55183,16 +55882,15 @@ index f3bef360d869..7b285e93ae73 100644
-
Library("av1_svc_config_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-index c21b84284b07..4da74178847c 100644
+index c21b84284b07..dce99512e78b 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -55208,7 +55906,7 @@ index c21b84284b07..4da74178847c 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,174 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55347,9 +56045,10 @@ index c21b84284b07..4da74178847c 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 += [
@@ -55385,16 +56084,15 @@ index c21b84284b07..4da74178847c 100644
-
Library("dav1d_decoder_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
-index 15ec27b21d92..81d812830263 100644
+index 15ec27b21d92..06fc30f5f006 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -55410,7 +56108,7 @@ index 15ec27b21d92..81d812830263 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55540,9 +56238,10 @@ index 15ec27b21d92..81d812830263 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 += [
@@ -55578,16 +56277,15 @@ index 15ec27b21d92..81d812830263 100644
-
Library("aom_av1_decoder_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_if_supported_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_if_supported_gn/moz.build
-index c0793ac64532..d774c100f280 100644
+index c0793ac64532..78ea3bb3a715 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_if_supported_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_if_supported_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -55603,7 +56301,7 @@ index c0793ac64532..d774c100f280 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55733,9 +56431,10 @@ index c0793ac64532..d774c100f280 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 += [
@@ -55771,16 +56470,15 @@ index c0793ac64532..d774c100f280 100644
-
Library("aom_av1_encoder_if_supported_gn")
diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-index 2c74aec10f15..51154d55ae9c 100644
+index 2c74aec10f15..1cff15f0207c 100644
--- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -55796,7 +56494,7 @@ index 2c74aec10f15..51154d55ae9c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55935,9 +56633,10 @@ index 2c74aec10f15..51154d55ae9c 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 += [
@@ -55973,16 +56672,15 @@ index 2c74aec10f15..51154d55ae9c 100644
-
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index b39c49bdadc3..36c0d8d19a21 100644
+index b39c49bdadc3..8a2b99b5d253 100644
--- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -55998,7 +56696,7 @@ index b39c49bdadc3..36c0d8d19a21 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56128,9 +56826,10 @@ index b39c49bdadc3..36c0d8d19a21 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 += [
@@ -56166,16 +56865,15 @@ index b39c49bdadc3..36c0d8d19a21 100644
-
Library("frame_dependencies_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index 34db2964e210..5f4dbd60ef14 100644
+index 34db2964e210..80fc8fcc1d90 100644
--- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -56191,7 +56889,7 @@ index 34db2964e210..5f4dbd60ef14 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56330,9 +57028,10 @@ index 34db2964e210..5f4dbd60ef14 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 += [
@@ -56368,16 +57067,15 @@ index 34db2964e210..5f4dbd60ef14 100644
-
Library("frame_helpers_gn")
diff --git third_party/libwebrtc/modules/video_coding/inter_frame_delay_gn/moz.build third_party/libwebrtc/modules/video_coding/inter_frame_delay_gn/moz.build
-index 39c9dc872e42..220978164808 100644
+index 39c9dc872e42..51664e2e391c 100644
--- third_party/libwebrtc/modules/video_coding/inter_frame_delay_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/inter_frame_delay_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -56393,7 +57091,7 @@ index 39c9dc872e42..220978164808 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56519,9 +57217,10 @@ index 39c9dc872e42..220978164808 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 += [
@@ -56557,16 +57256,15 @@ index 39c9dc872e42..220978164808 100644
-
Library("inter_frame_delay_gn")
diff --git third_party/libwebrtc/modules/video_coding/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/jitter_estimator_gn/moz.build
-index cf593c373a4d..701f8bf61d94 100644
+index cf593c373a4d..220b9c4c9d1a 100644
--- third_party/libwebrtc/modules/video_coding/jitter_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/jitter_estimator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -56582,7 +57280,7 @@ index cf593c373a4d..701f8bf61d94 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56721,9 +57419,10 @@ index cf593c373a4d..701f8bf61d94 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 += [
@@ -56759,16 +57458,15 @@ index cf593c373a4d..701f8bf61d94 100644
-
Library("jitter_estimator_gn")
diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-index 82f0c8ee2d1b..73ad3748bcf1 100644
+index 82f0c8ee2d1b..7e6132c596c6 100644
--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -56784,7 +57482,7 @@ index 82f0c8ee2d1b..73ad3748bcf1 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56921,9 +57619,10 @@ index 82f0c8ee2d1b..73ad3748bcf1 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 += [
@@ -56959,16 +57658,15 @@ index 82f0c8ee2d1b..73ad3748bcf1 100644
-
Library("nack_requester_gn")
diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index 12ec6e5913bc..cc728ddb9449 100644
+index 12ec6e5913bc..9f95558376b5 100644
--- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -56984,7 +57682,7 @@ index 12ec6e5913bc..cc728ddb9449 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57123,9 +57821,10 @@ index 12ec6e5913bc..cc728ddb9449 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 += [
@@ -57161,16 +57860,15 @@ index 12ec6e5913bc..cc728ddb9449 100644
-
Library("packet_buffer_gn")
diff --git third_party/libwebrtc/modules/video_coding/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/rtt_filter_gn/moz.build
-index 6d5975df6f43..6af583cbfae2 100644
+index 6d5975df6f43..5f50281931e2 100644
--- third_party/libwebrtc/modules/video_coding/rtt_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/rtt_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -57186,7 +57884,7 @@ index 6d5975df6f43..6af583cbfae2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57312,9 +58010,10 @@ index 6d5975df6f43..6af583cbfae2 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 += [
@@ -57350,16 +58049,15 @@ index 6d5975df6f43..6af583cbfae2 100644
-
Library("rtt_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-index 08ac03f56841..5f7113f47b58 100644
+index 08ac03f56841..fe6268db54ad 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -57375,7 +58073,7 @@ index 08ac03f56841..5f7113f47b58 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57501,9 +58199,10 @@ index 08ac03f56841..5f7113f47b58 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 += [
@@ -57539,16 +58238,15 @@ index 08ac03f56841..5f7113f47b58 100644
-
Library("scalability_mode_util_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-index dbd579d02d44..e792ee028f03 100644
+index dbd579d02d44..352319713761 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -57564,7 +58262,7 @@ index dbd579d02d44..e792ee028f03 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,165 +59,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,165 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57694,9 +58392,10 @@ index dbd579d02d44..e792ee028f03 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 += [
@@ -57732,16 +58431,15 @@ index dbd579d02d44..e792ee028f03 100644
-
Library("scalability_structures_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-index 8e22ed6814a7..d9bdc92df3b6 100644
+index 8e22ed6814a7..d534ab923de5 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -57757,7 +58455,7 @@ index 8e22ed6814a7..d9bdc92df3b6 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57883,9 +58581,10 @@ index 8e22ed6814a7..d9bdc92df3b6 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 += [
@@ -57921,16 +58620,15 @@ index 8e22ed6814a7..d9bdc92df3b6 100644
-
Library("scalable_video_controller_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-index cb5e4a4bf707..3242887c1b8a 100644
+index cb5e4a4bf707..a16be3b05afd 100644
--- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -57946,7 +58644,7 @@ index cb5e4a4bf707..3242887c1b8a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58076,9 +58774,10 @@ index cb5e4a4bf707..3242887c1b8a 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 += [
@@ -58114,16 +58813,15 @@ index cb5e4a4bf707..3242887c1b8a 100644
-
Library("svc_rate_allocator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing_gn/moz.build third_party/libwebrtc/modules/video_coding/timing_gn/moz.build
-index 6d1325709c05..a49f3a58ad46 100644
+index 6d1325709c05..7015194d6bea 100644
--- third_party/libwebrtc/modules/video_coding/timing_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -58139,7 +58837,7 @@ index 6d1325709c05..a49f3a58ad46 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58276,9 +58974,10 @@ index 6d1325709c05..a49f3a58ad46 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 += [
@@ -58314,16 +59013,15 @@ index 6d1325709c05..a49f3a58ad46 100644
-
Library("timing_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index da29622b17bf..07b8400cc04c 100644
+index da29622b17bf..01c957b82bfd 100644
--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -58339,7 +59037,7 @@ index da29622b17bf..07b8400cc04c 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,174 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58478,9 +59176,10 @@ index da29622b17bf..07b8400cc04c 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 += [
@@ -58516,16 +59215,15 @@ index da29622b17bf..07b8400cc04c 100644
-
Library("video_codec_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-index 2cb8a184972b..0b00d288769c 100644
+index 2cb8a184972b..e4a8a6926196 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -58541,7 +59239,7 @@ index 2cb8a184972b..0b00d288769c 100644
FINAL_LIBRARY = "webrtc"
-@@ -60,174 +71,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -60,174 +70,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58680,9 +59378,10 @@ index 2cb8a184972b..0b00d288769c 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 += [
@@ -58718,16 +59417,15 @@ index 2cb8a184972b..0b00d288769c 100644
-
Library("video_coding_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index 1fb1c3455908..62b7f13fc7c5 100644
+index 1fb1c3455908..8ed800072743 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -58743,7 +59441,7 @@ index 1fb1c3455908..62b7f13fc7c5 100644
FINAL_LIBRARY = "webrtc"
-@@ -52,174 +63,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,174 +62,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58882,9 +59580,10 @@ index 1fb1c3455908..62b7f13fc7c5 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 += [
@@ -58920,16 +59619,15 @@ index 1fb1c3455908..62b7f13fc7c5 100644
-
Library("video_coding_utility_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-index 68f59decaac9..386d4cc84137 100644
+index 68f59decaac9..5374c02be1ab 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -58945,7 +59643,7 @@ index 68f59decaac9..386d4cc84137 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,174 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59084,9 +59782,10 @@ index 68f59decaac9..386d4cc84137 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 += [
@@ -59122,16 +59821,15 @@ index 68f59decaac9..386d4cc84137 100644
-
Library("webrtc_h264_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index 6f360d915d5d..481340c96132 100644
+index 6f360d915d5d..653b68087a6c 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -59147,7 +59845,7 @@ index 6f360d915d5d..481340c96132 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59273,9 +59971,10 @@ index 6f360d915d5d..481340c96132 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 += [
@@ -59311,16 +60010,15 @@ index 6f360d915d5d..481340c96132 100644
-
Library("webrtc_libvpx_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
-index 2b1679f9417e..16388192462a 100644
+index 2b1679f9417e..43721cb39474 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -59336,7 +60034,7 @@ index 2b1679f9417e..16388192462a 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,174 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59475,9 +60173,10 @@ index 2b1679f9417e..16388192462a 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 += [
@@ -59513,16 +60212,15 @@ index 2b1679f9417e..16388192462a 100644
-
Library("webrtc_multiplex_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index d4a85cbfc7fe..7bd99d8fb65b 100644
+index d4a85cbfc7fe..557f8cce3ace 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -59538,7 +60236,7 @@ index d4a85cbfc7fe..7bd99d8fb65b 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,174 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59677,9 +60375,10 @@ index d4a85cbfc7fe..7bd99d8fb65b 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 += [
@@ -59715,16 +60414,15 @@ index d4a85cbfc7fe..7bd99d8fb65b 100644
-
Library("webrtc_vp8_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-index 62a8f103c953..c0e46c30eead 100644
+index 62a8f103c953..e8019e2d5bc3 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -59740,7 +60438,7 @@ index 62a8f103c953..c0e46c30eead 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59862,9 +60560,10 @@ index 62a8f103c953..c0e46c30eead 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 += [
@@ -59900,16 +60599,15 @@ index 62a8f103c953..c0e46c30eead 100644
-
Library("webrtc_vp8_scalability_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index 2e8bb42e847e..72fad492bc04 100644
+index 2e8bb42e847e..bd3f307bbc43 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -59925,7 +60623,7 @@ index 2e8bb42e847e..72fad492bc04 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,174 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60064,9 +60762,10 @@ index 2e8bb42e847e..72fad492bc04 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 += [
@@ -60102,16 +60801,15 @@ index 2e8bb42e847e..72fad492bc04 100644
-
Library("webrtc_vp8_temporal_layers_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index e3f0d1774eba..bc600aba357e 100644
+index e3f0d1774eba..36a2e95654f4 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -60127,7 +60825,7 @@ index e3f0d1774eba..bc600aba357e 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,174 +57,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60266,9 +60964,10 @@ index e3f0d1774eba..bc600aba357e 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 += [
@@ -60304,16 +61003,15 @@ index e3f0d1774eba..bc600aba357e 100644
-
Library("webrtc_vp9_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index c73282c2ee34..1df1e2086574 100644
+index c73282c2ee34..f5f423de241b 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -60329,7 +61027,7 @@ index c73282c2ee34..1df1e2086574 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,174 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60468,9 +61166,10 @@ index c73282c2ee34..1df1e2086574 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 += [
@@ -60506,16 +61205,15 @@ index c73282c2ee34..1df1e2086574 100644
-
Library("webrtc_vp9_helpers_gn")
diff --git third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
-index 0aaecfdf510a..50bb650fa9c5 100644
+index 0aaecfdf510a..70a93b65f156 100644
--- third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -60531,7 +61229,7 @@ index 0aaecfdf510a..50bb650fa9c5 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60649,9 +61347,10 @@ index 0aaecfdf510a..50bb650fa9c5 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 += [
@@ -60687,16 +61386,15 @@ index 0aaecfdf510a..50bb650fa9c5 100644
-
Library("denoiser_filter_gn")
diff --git third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
-index aa332adfa9a7..ea045edaba9d 100644
+index aa332adfa9a7..2bdd0d2bebbb 100644
--- third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
+++ third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -60712,7 +61410,7 @@ index aa332adfa9a7..ea045edaba9d 100644
FINAL_LIBRARY = "webrtc"
-@@ -47,174 +58,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60851,9 +61549,10 @@ index aa332adfa9a7..ea045edaba9d 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 += [
@@ -60889,16 +61588,15 @@ index aa332adfa9a7..ea045edaba9d 100644
-
Library("video_processing_gn")
diff --git third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
-index 3588b0ac325f..87afc7f9e0d3 100644
+index 3588b0ac325f..e1d6759739e5 100644
--- third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
+++ third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
-@@ -12,12 +12,23 @@ 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_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_ARCH_ARM64"] = True
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -60916,7 +61614,7 @@ index 3588b0ac325f..87afc7f9e0d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,133 +54,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,133 +53,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61012,12 +61710,12 @@ index 3588b0ac325f..87afc7f9e0d3 100644
-
-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"] == "Darwin":
+-
+- DEFINES["_DEBUG"] = True
+-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
@@ -61031,9 +61729,10 @@ index 3588b0ac325f..87afc7f9e0d3 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"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
@@ -61051,10 +61750,10 @@ index 3588b0ac325f..87afc7f9e0d3 100644
-
Library("video_processing_neon_gn")
diff --git third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build
-index 9d41f521fdb8..dcf89200ff1e 100644
+index 9d41f521fdb8..0c3a0c9fcefc 100644
--- third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build
+++ third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn/moz.build
-@@ -9,14 +9,28 @@
+@@ -9,14 +9,27 @@
COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings()
@@ -61067,7 +61766,6 @@ index 9d41f521fdb8..dcf89200ff1e 100644
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
-+DEFINES["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -61083,7 +61781,7 @@ index 9d41f521fdb8..dcf89200ff1e 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,143 +56,6 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,143 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61206,20 +61904,21 @@ index 9d41f521fdb8..dcf89200ff1e 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"
-
-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"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -61515,16 +62214,15 @@ index 3b546257660a..c7fa79488695 100644
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
diff --git third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-index 5628bb3a4ff8..0eadaa981581 100644
+index 5628bb3a4ff8..47fb8bc57c43 100644
--- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -61540,7 +62238,7 @@ index 5628bb3a4ff8..0eadaa981581 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61674,9 +62372,10 @@ index 5628bb3a4ff8..0eadaa981581 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 += [
@@ -61712,16 +62411,15 @@ index 5628bb3a4ff8..0eadaa981581 100644
-
Library("async_resolver_interface_gn")
diff --git third_party/libwebrtc/rtc_base/async_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
-index 732d8224bb5a..9a40b51c9f19 100644
+index 732d8224bb5a..cd84d89e28c8 100644
--- third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -61737,7 +62435,7 @@ index 732d8224bb5a..9a40b51c9f19 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61871,9 +62569,10 @@ index 732d8224bb5a..9a40b51c9f19 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 += [
@@ -61909,16 +62608,15 @@ index 732d8224bb5a..9a40b51c9f19 100644
-
Library("async_socket_gn")
diff --git third_party/libwebrtc/rtc_base/atomicops_gn/moz.build third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
-index 8194e6319634..ffdd23ac5fc7 100644
+index 8194e6319634..739f29eb59d9 100644
--- third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
+++ third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -61934,7 +62632,7 @@ index 8194e6319634..ffdd23ac5fc7 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62052,9 +62750,10 @@ index 8194e6319634..ffdd23ac5fc7 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 += [
@@ -62090,16 +62789,15 @@ index 8194e6319634..ffdd23ac5fc7 100644
-
Library("atomicops_gn")
diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-index 10985c3a09a3..328ea5ac90fc 100644
+index 10985c3a09a3..12fe81e90a59 100644
--- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
+++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -62115,7 +62813,7 @@ index 10985c3a09a3..328ea5ac90fc 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62245,9 +62943,10 @@ index 10985c3a09a3..328ea5ac90fc 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 += [
@@ -62283,16 +62982,15 @@ index 10985c3a09a3..328ea5ac90fc 100644
-
Library("audio_format_to_string_gn")
diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index b3daad93040a..65170d23e610 100644
+index b3daad93040a..d18471cbb946 100644
--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -62308,7 +63006,7 @@ index b3daad93040a..65170d23e610 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62434,9 +63132,10 @@ index b3daad93040a..65170d23e610 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 += [
@@ -62472,16 +63171,15 @@ index b3daad93040a..65170d23e610 100644
-
Library("bit_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index 5578717236fa..7370fa8b63ca 100644
+index 5578717236fa..ba596983b322 100644
--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -62497,7 +63195,7 @@ index 5578717236fa..7370fa8b63ca 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62623,9 +63321,10 @@ index 5578717236fa..7370fa8b63ca 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 += [
@@ -62661,16 +63360,15 @@ index 5578717236fa..7370fa8b63ca 100644
-
Library("bitstream_reader_gn")
diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-index 153ffc6d7bec..567314690a2b 100644
+index 153ffc6d7bec..b2d99bd4e310 100644
--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -62686,7 +63384,7 @@ index 153ffc6d7bec..567314690a2b 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62808,9 +63506,10 @@ index 153ffc6d7bec..567314690a2b 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 += [
@@ -62846,16 +63545,15 @@ index 153ffc6d7bec..567314690a2b 100644
-
Library("buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-index ab65698bbdbc..bfb49ab809c5 100644
+index ab65698bbdbc..681652e6c65c 100644
--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -62871,7 +63569,7 @@ index ab65698bbdbc..bfb49ab809c5 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62997,9 +63695,10 @@ index ab65698bbdbc..bfb49ab809c5 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 += [
@@ -63035,16 +63734,15 @@ index ab65698bbdbc..bfb49ab809c5 100644
-
Library("byte_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-index 3cda1af49dc2..e917cde5294d 100644
+index 3cda1af49dc2..9f18b513a3e7 100644
--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -63060,7 +63758,7 @@ index 3cda1af49dc2..e917cde5294d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63178,9 +63876,10 @@ index 3cda1af49dc2..e917cde5294d 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 += [
@@ -63216,16 +63915,15 @@ index 3cda1af49dc2..e917cde5294d 100644
-
Library("byte_order_gn")
diff --git third_party/libwebrtc/rtc_base/callback_list_gn/moz.build third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
-index 6c63dc79e25e..015987007a93 100644
+index 6c63dc79e25e..9ff476fbcfd0 100644
--- third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
+++ third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -63241,7 +63939,7 @@ index 6c63dc79e25e..015987007a93 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63367,9 +64065,10 @@ index 6c63dc79e25e..015987007a93 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 += [
@@ -63405,16 +64104,15 @@ index 6c63dc79e25e..015987007a93 100644
-
Library("callback_list_gn")
diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index 1c7ee114d266..6d66f2c49032 100644
+index 1c7ee114d266..cbfd21ec0181 100644
--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -63430,7 +64128,7 @@ index 1c7ee114d266..6d66f2c49032 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63556,9 +64254,10 @@ index 1c7ee114d266..6d66f2c49032 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 += [
@@ -63594,16 +64293,15 @@ index 1c7ee114d266..6d66f2c49032 100644
-
Library("checks_gn")
diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-index 710110b47814..a6dac8c81061 100644
+index 710110b47814..89cf3756d48f 100644
--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -63619,7 +64317,7 @@ index 710110b47814..a6dac8c81061 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63737,9 +64435,10 @@ index 710110b47814..a6dac8c81061 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 += [
@@ -63775,16 +64474,15 @@ index 710110b47814..a6dac8c81061 100644
-
Library("compile_assert_c_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-index aeba5a1f25a5..1aec2d8e0648 100644
+index aeba5a1f25a5..f2fd0ab3ebab 100644
--- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -63800,7 +64498,7 @@ index aeba5a1f25a5..1aec2d8e0648 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63926,9 +64624,10 @@ index aeba5a1f25a5..1aec2d8e0648 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 += [
@@ -63964,16 +64663,15 @@ index aeba5a1f25a5..1aec2d8e0648 100644
-
Library("flat_containers_internal_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-index 0f8ada65b808..43d1001fcfb9 100644
+index 0f8ada65b808..a7da0c928a3f 100644
--- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -63989,7 +64687,7 @@ index 0f8ada65b808..43d1001fcfb9 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64111,9 +64809,10 @@ index 0f8ada65b808..43d1001fcfb9 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 += [
@@ -64149,16 +64848,15 @@ index 0f8ada65b808..43d1001fcfb9 100644
-
Library("flat_map_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-index 78923e89eab3..1f1707406877 100644
+index 78923e89eab3..2eb4118af594 100644
--- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -64174,7 +64872,7 @@ index 78923e89eab3..1f1707406877 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64296,9 +64994,10 @@ index 78923e89eab3..1f1707406877 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 += [
@@ -64334,16 +65033,15 @@ index 78923e89eab3..1f1707406877 100644
-
Library("flat_set_gn")
diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-index 5a3b34c3eb3f..ad1063cbf7da 100644
+index 5a3b34c3eb3f..42099791f250 100644
--- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -64359,7 +65057,7 @@ index 5a3b34c3eb3f..ad1063cbf7da 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64485,9 +65183,10 @@ index 5a3b34c3eb3f..ad1063cbf7da 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 += [
@@ -64523,16 +65222,15 @@ index 5a3b34c3eb3f..ad1063cbf7da 100644
-
Library("copy_on_write_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index 9e2ce84542b5..980f958b84ce 100644
+index 9e2ce84542b5..62e32f186625 100644
--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -64548,7 +65246,7 @@ index 9e2ce84542b5..980f958b84ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64674,9 +65372,10 @@ index 9e2ce84542b5..980f958b84ce 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 += [
@@ -64712,16 +65411,15 @@ index 9e2ce84542b5..980f958b84ce 100644
-
Library("criticalsection_gn")
diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index 0a389c181a0f..0ca36c58ba94 100644
+index 0a389c181a0f..b8aa831636e1 100644
--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -64737,7 +65435,7 @@ index 0a389c181a0f..0ca36c58ba94 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64859,9 +65557,10 @@ index 0a389c181a0f..0ca36c58ba94 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 += [
@@ -64897,16 +65596,15 @@ index 0a389c181a0f..0ca36c58ba94 100644
-
Library("divide_round_gn")
diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-index 50d367865f42..2ac2363b4554 100644
+index 50d367865f42..a2edb19a6a18 100644
--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -64922,7 +65620,7 @@ index 50d367865f42..2ac2363b4554 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65052,9 +65750,10 @@ index 50d367865f42..2ac2363b4554 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 += [
@@ -65090,16 +65789,15 @@ index 50d367865f42..2ac2363b4554 100644
-
Library("event_tracer_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index 6fae52bb42f3..63cf348c225b 100644
+index 6fae52bb42f3..74a792863f98 100644
--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -65115,7 +65813,7 @@ index 6fae52bb42f3..63cf348c225b 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65245,9 +65943,10 @@ index 6fae52bb42f3..63cf348c225b 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 += [
@@ -65283,16 +65982,15 @@ index 6fae52bb42f3..63cf348c225b 100644
-
Library("alr_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index 4e7e01cb33c9..89fc93c45ca6 100644
+index 4e7e01cb33c9..ad9fa6f31eb9 100644
--- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -65308,7 +66006,7 @@ index 4e7e01cb33c9..89fc93c45ca6 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65438,9 +66136,10 @@ index 4e7e01cb33c9..89fc93c45ca6 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 += [
@@ -65476,16 +66175,15 @@ index 4e7e01cb33c9..89fc93c45ca6 100644
-
Library("balanced_degradation_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
-index b77512ed7ca4..f72ea8580ecd 100644
+index b77512ed7ca4..f883d87512f8 100644
--- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -65501,7 +66199,7 @@ index b77512ed7ca4..f72ea8580ecd 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65631,9 +66329,10 @@ index b77512ed7ca4..f72ea8580ecd 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 += [
@@ -65669,16 +66368,15 @@ index b77512ed7ca4..f72ea8580ecd 100644
-
Library("bandwidth_quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-index b2eda23031d9..72cff0d78a04 100644
+index b2eda23031d9..c2aefebf335f 100644
--- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -65694,7 +66392,7 @@ index b2eda23031d9..72cff0d78a04 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65824,9 +66522,10 @@ index b2eda23031d9..72cff0d78a04 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 += [
@@ -65862,16 +66561,15 @@ index b2eda23031d9..72cff0d78a04 100644
-
Library("cpu_speed_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-index 28b528d00af0..629ad8ee96bc 100644
+index 28b528d00af0..dc663b172140 100644
--- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -65887,7 +66585,7 @@ index 28b528d00af0..629ad8ee96bc 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66017,9 +66715,10 @@ index 28b528d00af0..629ad8ee96bc 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 += [
@@ -66055,16 +66754,15 @@ index 28b528d00af0..629ad8ee96bc 100644
-
Library("encoder_info_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index b87d19dcfa02..eeee34272bc1 100644
+index b87d19dcfa02..79155a069937 100644
--- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -66080,7 +66778,7 @@ index b87d19dcfa02..eeee34272bc1 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,165 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66210,9 +66908,10 @@ index b87d19dcfa02..eeee34272bc1 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 += [
@@ -66248,16 +66947,15 @@ index b87d19dcfa02..eeee34272bc1 100644
-
Library("field_trial_parser_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
-index d99945875231..5befecd8dd32 100644
+index d99945875231..8c5e660e2d89 100644
--- third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -66273,7 +66971,7 @@ index d99945875231..5befecd8dd32 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66403,9 +67101,10 @@ index d99945875231..5befecd8dd32 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -66441,16 +67140,15 @@ index d99945875231..5befecd8dd32 100644
-
Library("jitter_upper_bound_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index 4fc29dd00bdc..31e21ce3c671 100644
+index 4fc29dd00bdc..981a45f0db1c 100644
--- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -66466,7 +67164,7 @@ index 4fc29dd00bdc..31e21ce3c671 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66596,9 +67294,10 @@ index 4fc29dd00bdc..31e21ce3c671 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 += [
@@ -66634,16 +67333,15 @@ index 4fc29dd00bdc..31e21ce3c671 100644
-
Library("keyframe_interval_settings_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index eb804281b3b4..3dc23f343459 100644
+index eb804281b3b4..b1ca07bf3516 100644
--- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -66659,7 +67357,7 @@ index eb804281b3b4..3dc23f343459 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66789,9 +67487,10 @@ index eb804281b3b4..3dc23f343459 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 += [
@@ -66827,16 +67526,15 @@ index eb804281b3b4..3dc23f343459 100644
-
Library("min_video_bitrate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-index b1c8c0d0f5da..181024d0a199 100644
+index b1c8c0d0f5da..4161e1d2d4c4 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -66852,7 +67550,7 @@ index b1c8c0d0f5da..181024d0a199 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66982,9 +67680,10 @@ index b1c8c0d0f5da..181024d0a199 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 += [
@@ -67020,16 +67719,15 @@ index b1c8c0d0f5da..181024d0a199 100644
-
Library("quality_rampup_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index e03ac53c529c..d177c9b05eb6 100644
+index e03ac53c529c..86fc14d049d4 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -67045,7 +67743,7 @@ index e03ac53c529c..d177c9b05eb6 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67175,9 +67873,10 @@ index e03ac53c529c..d177c9b05eb6 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 += [
@@ -67213,16 +67912,15 @@ index e03ac53c529c..d177c9b05eb6 100644
-
Library("quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index 8eab3b601803..db290bd1a145 100644
+index 8eab3b601803..589003868373 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -67238,7 +67936,7 @@ index 8eab3b601803..db290bd1a145 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67368,9 +68066,10 @@ index 8eab3b601803..db290bd1a145 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 += [
@@ -67406,16 +68105,15 @@ index 8eab3b601803..db290bd1a145 100644
-
Library("quality_scaling_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index 0d2c512c84c9..c7f5cc369b19 100644
+index 0d2c512c84c9..0685f26b42d7 100644
--- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -67431,7 +68129,7 @@ index 0d2c512c84c9..c7f5cc369b19 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67561,9 +68259,10 @@ index 0d2c512c84c9..c7f5cc369b19 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 += [
@@ -67599,16 +68298,15 @@ index 0d2c512c84c9..c7f5cc369b19 100644
-
Library("rate_control_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-index a2d84caa9cb3..48f9c3d7c71b 100644
+index a2d84caa9cb3..a279d9d22081 100644
--- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -67624,7 +68322,7 @@ index a2d84caa9cb3..48f9c3d7c71b 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67754,9 +68452,10 @@ index a2d84caa9cb3..48f9c3d7c71b 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 += [
@@ -67792,16 +68491,15 @@ index a2d84caa9cb3..48f9c3d7c71b 100644
-
Library("rtt_mult_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-index 587c408000b8..21ef61cd0fc6 100644
+index 587c408000b8..d03c88253ad4 100644
--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -67817,7 +68515,7 @@ index 587c408000b8..21ef61cd0fc6 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67947,9 +68645,10 @@ index 587c408000b8..21ef61cd0fc6 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 += [
@@ -67985,16 +68684,15 @@ index 587c408000b8..21ef61cd0fc6 100644
-
Library("stable_target_rate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index 1823f5043239..761884f345a8 100644
+index 1823f5043239..95ed70141a86 100644
--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -68010,7 +68708,7 @@ index 1823f5043239..761884f345a8 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68128,9 +68826,10 @@ index 1823f5043239..761884f345a8 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 += [
@@ -68166,16 +68865,15 @@ index 1823f5043239..761884f345a8 100644
-
Library("gtest_prod_gn")
diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-index b4a901c6ef51..cd9783822b1e 100644
+index b4a901c6ef51..371cbfdafaa5 100644
--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -68191,7 +68889,7 @@ index b4a901c6ef51..cd9783822b1e 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68317,9 +69015,10 @@ index b4a901c6ef51..cd9783822b1e 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 += [
@@ -68354,17 +69053,110 @@ index b4a901c6ef51..cd9783822b1e 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("histogram_percentile_counter_gn")
+diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
+deleted file mode 100644
+index 404b7f5f924a..000000000000
+--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
++++ /dev/null
+@@ -1,88 +0,0 @@
+-# This Source Code Form is subject to the terms of the Mozilla Public
+-# License, v. 2.0. If a copy of the MPL was not distributed with this
+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-
+-
+- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
+- ### DO NOT edit it by hand. ###
+-
+-COMPILE_FLAGS["OS_INCLUDES"] = []
+-AllowCompilerWarnings()
+-
+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["ANDROID"] = True
+-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-DEFINES["HAVE_SYS_UIO_H"] = True
+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+-DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ANDROID"] = True
+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+-DEFINES["WEBRTC_LINUX"] = True
+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["_GNU_SOURCE"] = True
+-DEFINES["__STDC_CONSTANT_MACROS"] = True
+-DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-FINAL_LIBRARY = "webrtc"
+-
+-
+-LOCAL_INCLUDES += [
+- "!/ipc/ipdl/_ipdlheaders",
+- "/ipc/chromium/src",
+- "/third_party/libwebrtc/",
+- "/third_party/libwebrtc/third_party/abseil-cpp/",
+- "/tools/profiler/public"
+-]
+-
+-OS_LIBS += [
+- "GLESv2",
+- "log"
+-]
+-
+-UNIFIED_SOURCES += [
+- "/third_party/libwebrtc/rtc_base/ifaddrs_android.cc"
+-]
+-
+-if not CONFIG["MOZ_DEBUG"]:
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+- DEFINES["NDEBUG"] = True
+- DEFINES["NVALGRIND"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1":
+-
+- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+- DEFINES["_DEBUG"] = True
+-
+-if CONFIG["CPU_ARCH"] == "aarch64":
+-
+- DEFINES["WEBRTC_ARCH_ARM64"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+- CXXFLAGS += [
+- "-mfpu=neon"
+- ]
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+- OS_LIBS += [
+- "android_support",
+- "unwind"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "x86":
+-
+- OS_LIBS += [
+- "android_support"
+- ]
+-
+-Library("ifaddrs_android_gn")
diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index 7b8ac423f8d1..fd81bcdfb828 100644
+index 7b8ac423f8d1..fda3fcb7ee03 100644
--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -68380,7 +69172,7 @@ index 7b8ac423f8d1..fd81bcdfb828 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68498,9 +69290,10 @@ index 7b8ac423f8d1..fd81bcdfb828 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 += [
@@ -68536,16 +69329,15 @@ index 7b8ac423f8d1..fd81bcdfb828 100644
-
Library("ignore_wundef_gn")
diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-index 686dd85e6761..9cbbf066083c 100644
+index 686dd85e6761..fe2c7a08a1a8 100644
--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -68561,7 +69353,7 @@ index 686dd85e6761..9cbbf066083c 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68695,9 +69487,10 @@ index 686dd85e6761..9cbbf066083c 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 += [
@@ -68733,16 +69526,15 @@ index 686dd85e6761..9cbbf066083c 100644
-
Library("ip_address_gn")
diff --git third_party/libwebrtc/rtc_base/location_gn/moz.build third_party/libwebrtc/rtc_base/location_gn/moz.build
-index e5ccd52a24a3..06db599d9bf0 100644
+index e5ccd52a24a3..61b1ea14bb0e 100644
--- third_party/libwebrtc/rtc_base/location_gn/moz.build
+++ third_party/libwebrtc/rtc_base/location_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -68758,7 +69550,7 @@ index e5ccd52a24a3..06db599d9bf0 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68880,9 +69672,10 @@ index e5ccd52a24a3..06db599d9bf0 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 += [
@@ -68918,16 +69711,15 @@ index e5ccd52a24a3..06db599d9bf0 100644
-
Library("location_gn")
diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 25c1b293e768..f15df9d8079a 100644
+index 25c1b293e768..1ee3e013fdf4 100644
--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -68943,7 +69735,7 @@ index 25c1b293e768..f15df9d8079a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69073,9 +69865,10 @@ index 25c1b293e768..f15df9d8079a 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 += [
@@ -69111,16 +69904,15 @@ index 25c1b293e768..f15df9d8079a 100644
-
Library("logging_gn")
diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index acc69504c3b6..9965c312c01e 100644
+index acc69504c3b6..1d52ca24913f 100644
--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -69136,7 +69928,7 @@ index acc69504c3b6..9965c312c01e 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69254,9 +70046,10 @@ index acc69504c3b6..9965c312c01e 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 += [
@@ -69292,16 +70085,15 @@ index acc69504c3b6..9965c312c01e 100644
-
Library("macromagic_gn")
diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index aeb28674b90e..275da59d6f22 100644
+index aeb28674b90e..36f62de9f2ec 100644
--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -69317,7 +70109,7 @@ index aeb28674b90e..275da59d6f22 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69443,9 +70235,10 @@ index aeb28674b90e..275da59d6f22 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 += [
@@ -69481,16 +70274,15 @@ index aeb28674b90e..275da59d6f22 100644
-
Library("aligned_malloc_gn")
diff --git third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build
-index 3e4d3419f80b..4727b1a26a34 100644
+index 3e4d3419f80b..9d6236051c42 100644
--- third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/memory/always_valid_pointer_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -69506,7 +70298,7 @@ index 3e4d3419f80b..4727b1a26a34 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69628,9 +70420,10 @@ index 3e4d3419f80b..4727b1a26a34 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 += [
@@ -69666,16 +70459,15 @@ index 3e4d3419f80b..4727b1a26a34 100644
-
Library("always_valid_pointer_gn")
diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index d41b52655bce..687b68088e44 100644
+index d41b52655bce..522cda07763b 100644
--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -69691,7 +70483,7 @@ index d41b52655bce..687b68088e44 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69813,9 +70605,10 @@ index d41b52655bce..687b68088e44 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 += [
@@ -69851,16 +70644,15 @@ index d41b52655bce..687b68088e44 100644
-
Library("mod_ops_gn")
diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-index 0764466d8e3b..c1e0b7181a2f 100644
+index 0764466d8e3b..5f2029471f2f 100644
--- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -69876,7 +70668,7 @@ index 0764466d8e3b..c1e0b7181a2f 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69998,9 +70790,10 @@ index 0764466d8e3b..c1e0b7181a2f 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 += [
@@ -70036,16 +70829,15 @@ index 0764466d8e3b..c1e0b7181a2f 100644
-
Library("moving_max_counter_gn")
diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-index 9544696f1008..a37d8732a031 100644
+index 9544696f1008..d58709a21a1e 100644
--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -70061,7 +70853,7 @@ index 9544696f1008..a37d8732a031 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70195,9 +70987,10 @@ index 9544696f1008..a37d8732a031 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 += [
@@ -70233,16 +71026,15 @@ index 9544696f1008..a37d8732a031 100644
-
Library("net_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index e91b1ddbda6c..1d7b629eac0b 100644
+index e91b1ddbda6c..1d867252d81c 100644
--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -70258,7 +71050,7 @@ index e91b1ddbda6c..1d7b629eac0b 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70380,9 +71172,10 @@ index e91b1ddbda6c..1d7b629eac0b 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 += [
@@ -70418,16 +71211,15 @@ index e91b1ddbda6c..1d7b629eac0b 100644
-
Library("sent_packet_gn")
diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-index 14b68b441e64..45ec45b4e43b 100644
+index 14b68b441e64..ba1b2ca9935f 100644
--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -70443,7 +71235,7 @@ index 14b68b441e64..45ec45b4e43b 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70569,9 +71361,10 @@ index 14b68b441e64..45ec45b4e43b 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 += [
@@ -70607,16 +71400,15 @@ index 14b68b441e64..45ec45b4e43b 100644
-
Library("network_constants_gn")
diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-index 52ae3bc16660..b84b5f78979e 100644
+index 52ae3bc16660..16674329bbce 100644
--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -70632,7 +71424,7 @@ index 52ae3bc16660..b84b5f78979e 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70766,9 +71558,10 @@ index 52ae3bc16660..b84b5f78979e 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 += [
@@ -70804,16 +71597,15 @@ index 52ae3bc16660..b84b5f78979e 100644
-
Library("null_socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-index a10089f6f666..745e0ab49bec 100644
+index a10089f6f666..8485d4793a5e 100644
--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -70829,7 +71621,7 @@ index a10089f6f666..745e0ab49bec 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70951,9 +71743,10 @@ index a10089f6f666..745e0ab49bec 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 += [
@@ -70989,16 +71782,15 @@ index a10089f6f666..745e0ab49bec 100644
-
Library("one_time_event_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index c759dfd0eebd..8b38565b6e71 100644
+index c759dfd0eebd..96517102c624 100644
--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -71014,7 +71806,7 @@ index c759dfd0eebd..8b38565b6e71 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71144,9 +71936,10 @@ index c759dfd0eebd..8b38565b6e71 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 += [
@@ -71182,16 +71975,15 @@ index c759dfd0eebd..8b38565b6e71 100644
-
Library("platform_thread_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index 5962bb527ef7..efa7139c2352 100644
+index 5962bb527ef7..506d35309aed 100644
--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -71207,7 +71999,7 @@ index 5962bb527ef7..efa7139c2352 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,157 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71329,9 +72121,10 @@ index 5962bb527ef7..efa7139c2352 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 += [
@@ -71367,16 +72160,15 @@ index 5962bb527ef7..efa7139c2352 100644
-
Library("platform_thread_types_gn")
diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index 48de05c6565d..8c03470b94e6 100644
+index 48de05c6565d..c1a93ff618ca 100644
--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -71392,7 +72184,7 @@ index 48de05c6565d..8c03470b94e6 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71510,9 +72302,10 @@ index 48de05c6565d..8c03470b94e6 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 += [
@@ -71548,16 +72341,15 @@ index 48de05c6565d..8c03470b94e6 100644
-
Library("protobuf_utils_gn")
diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-index e1eee7aaa3b1..60241ae095b2 100644
+index e1eee7aaa3b1..f23e850ec5b3 100644
--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -71573,7 +72365,7 @@ index e1eee7aaa3b1..60241ae095b2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71699,9 +72491,10 @@ index e1eee7aaa3b1..60241ae095b2 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 += [
@@ -71737,16 +72530,15 @@ index e1eee7aaa3b1..60241ae095b2 100644
-
Library("race_checker_gn")
diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
-index a0f473e42d34..7a4f0f4ef024 100644
+index a0f473e42d34..39ae2da973a6 100644
--- third_party/libwebrtc/rtc_base/random_gn/moz.build
+++ third_party/libwebrtc/rtc_base/random_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -71762,7 +72554,7 @@ index a0f473e42d34..7a4f0f4ef024 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71888,9 +72680,10 @@ index a0f473e42d34..7a4f0f4ef024 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 += [
@@ -71926,16 +72719,15 @@ index a0f473e42d34..7a4f0f4ef024 100644
-
Library("random_gn")
diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index f3b81590de11..a1d09d884f22 100644
+index f3b81590de11..f71d50ba8718 100644
--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -71951,7 +72743,7 @@ index f3b81590de11..a1d09d884f22 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,172 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72088,9 +72880,10 @@ index f3b81590de11..a1d09d884f22 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 += [
@@ -72126,16 +72919,15 @@ index f3b81590de11..a1d09d884f22 100644
-
Library("rate_limiter_gn")
diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-index fdb081242ba1..70f8e5a391a9 100644
+index fdb081242ba1..432cb13774bf 100644
--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -72151,7 +72943,7 @@ index fdb081242ba1..70f8e5a391a9 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72281,9 +73073,10 @@ index fdb081242ba1..70f8e5a391a9 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 += [
@@ -72319,16 +73112,15 @@ index fdb081242ba1..70f8e5a391a9 100644
-
Library("rate_statistics_gn")
diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-index b793860d1fce..8e541e2e1279 100644
+index b793860d1fce..615068342e2c 100644
--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -72344,7 +73136,7 @@ index b793860d1fce..8e541e2e1279 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72474,9 +73266,10 @@ index b793860d1fce..8e541e2e1279 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 += [
@@ -72512,16 +73305,15 @@ index b793860d1fce..8e541e2e1279 100644
-
Library("rate_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index 765cb316c386..2e4cc7628227 100644
+index 765cb316c386..20e25b4b8f4b 100644
--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -72537,7 +73329,7 @@ index 765cb316c386..2e4cc7628227 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72655,9 +73447,10 @@ index 765cb316c386..2e4cc7628227 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 += [
@@ -72693,16 +73486,15 @@ index 765cb316c386..2e4cc7628227 100644
-
Library("refcount_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-index 5b5c4803e02f..55398cd2d8f5 100644
+index 5b5c4803e02f..2e37d9a011ce 100644
--- third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -72718,7 +73510,7 @@ index 5b5c4803e02f..55398cd2d8f5 100644
FINAL_LIBRARY = "webrtc"
-@@ -33,6 +44,7 @@ UNIFIED_SOURCES += [
+@@ -33,6 +43,7 @@ UNIFIED_SOURCES += [
"/third_party/libwebrtc/rtc_base/crypt_string.cc",
"/third_party/libwebrtc/rtc_base/data_rate_limiter.cc",
"/third_party/libwebrtc/rtc_base/file_rotating_stream.cc",
@@ -72726,7 +73518,7 @@ index 5b5c4803e02f..55398cd2d8f5 100644
"/third_party/libwebrtc/rtc_base/log_sinks.cc",
"/third_party/libwebrtc/rtc_base/network_route.cc",
"/third_party/libwebrtc/rtc_base/stream.cc"
-@@ -47,191 +59,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,191 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72882,9 +73674,10 @@ index 5b5c4803e02f..55398cd2d8f5 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 += [
@@ -72920,16 +73713,15 @@ index 5b5c4803e02f..55398cd2d8f5 100644
-
Library("rtc_base_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-index 8357ece6eb30..12d53841431b 100644
+index 8357ece6eb30..6c60ddd28df2 100644
--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -72945,7 +73737,7 @@ index 8357ece6eb30..12d53841431b 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73071,9 +73863,10 @@ index 8357ece6eb30..12d53841431b 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 += [
@@ -73109,16 +73902,15 @@ index 8357ece6eb30..12d53841431b 100644
-
Library("rtc_event_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index 46355c5d0d6c..552bfd50b19e 100644
+index 46355c5d0d6c..f2bdd05562f7 100644
--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -73134,7 +73926,7 @@ index 46355c5d0d6c..552bfd50b19e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,161 +54,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,161 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73260,9 +74052,10 @@ index 46355c5d0d6c..552bfd50b19e 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 += [
@@ -73298,16 +74091,15 @@ index 46355c5d0d6c..552bfd50b19e 100644
-
Library("rtc_numerics_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-index 333461b952e1..aebdaae61163 100644
+index 333461b952e1..1d8bba37341e 100644
--- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -73323,7 +74115,7 @@ index 333461b952e1..aebdaae61163 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73449,9 +74241,10 @@ index 333461b952e1..aebdaae61163 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 += [
@@ -73487,16 +74280,15 @@ index 333461b952e1..aebdaae61163 100644
-
Library("rtc_task_queue_gn")
diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index fd120e422965..3b726daa5faf 100644
+index fd120e422965..8147a59fe325 100644
--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -73512,7 +74304,7 @@ index fd120e422965..3b726daa5faf 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73630,9 +74422,10 @@ index fd120e422965..3b726daa5faf 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 += [
@@ -73668,16 +74461,15 @@ index fd120e422965..3b726daa5faf 100644
-
Library("safe_compare_gn")
diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index aa5d30753476..446866ad9cf5 100644
+index aa5d30753476..23497bfe94f9 100644
--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -73693,7 +74485,7 @@ index aa5d30753476..446866ad9cf5 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73815,9 +74607,10 @@ index aa5d30753476..446866ad9cf5 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 += [
@@ -73853,16 +74646,15 @@ index aa5d30753476..446866ad9cf5 100644
-
Library("safe_conversions_gn")
diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index fd5b77f258ab..e600b635490d 100644
+index fd5b77f258ab..27ad4b92689d 100644
--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -73878,7 +74670,7 @@ index fd5b77f258ab..e600b635490d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74000,9 +74792,10 @@ index fd5b77f258ab..e600b635490d 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"