Attachment 239898 Details for Bug 269092 – librewolf.diff

[patch] librewolf.diff

librewolf.diff (text/plain), 781.18 KB, created by Martin Filla on 2023-02-04 13:27:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Filla

Created: 2023-02-04 13:27:40 UTC

Size: 781.18 KB

patch

obsolete

>diff --git a/www/librewolf.orig/Makefile b/www/librewolf/Makefile
>index 84bd949..98b0c4d 100644
>--- a/www/librewolf.orig/Makefile
>+++ b/www/librewolf/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	librewolf
>-DISTVERSION=	108.0.1-1
>+DISTVERSION=	109.0-1
> CATEGORIES=	www wayland
> MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${DISTVERSION}/
> DISTNAME=	${PORTNAME}-${DISTVERSION}.source.
>diff --git a/www/librewolf.orig/distinfo b/www/librewolf/distinfo
>index 9ce5561..be9d9b0 100644
>--- a/www/librewolf.orig/distinfo
>+++ b/www/librewolf/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1671892824
>-SHA256 (librewolf-108.0.1-1.source.tar.gz) = d1978f870ebddbcb71e92da9887e6de99818c4d8045642c46a5b3d2e2b970e81
>-SIZE (librewolf-108.0.1-1.source.tar.gz) = 828438372
>+TIMESTAMP = 1675516877
>+SHA256 (librewolf-109.0-1.source.tar.gz) = c549b7f6e6b407c128578b2c9c59a6ddec7bd79dc1d5563d26b9f21547c133f8
>+SIZE (librewolf-109.0-1.source.tar.gz) = 820929021
> SHA256 (patches/unity-menubar.patch?inline=false) = 84c03a4eb5dcc1bb9e2cfc343e0b98bbbc8dc791647747082d3f50ba638de965
> SIZE (patches/unity-menubar.patch?inline=false) = 163635
>diff --git a/www/librewolf.orig/files/patch-bug847568 b/www/librewolf/files/patch-bug847568
>index 3161dbb..2b3c5e1 100644
>--- a/www/librewolf.orig/files/patch-bug847568
>+++ b/www/librewolf/files/patch-bug847568
>@@ -97,13 +97,9 @@ index b91d9c1..a97e6eb 100755
>  echo If gfx/graphite2/src/files.mk has changed, please make corresponding
> diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla
> index 3180257..4587a3b 100644
>---- gfx/harfbuzz/README-mozilla
>-+++ gfx/harfbuzz/README-mozilla
>-@@ -21,3 +21,8 @@ from within the gfx/harfbuzz directory.
>- 
>- If the collection of source files changes, manual updates to moz.build may be
>- needed as we don't use the upstream makefiles.
>-+
>+--- /dev/null
>++++ gfx/harfbuzz/README-mozilla.fbsd
>+@@ -0,0 +1,4 @@
> +The in-tree copy may be omitted during build by --with-system-harfbuzz.
> +Make sure to keep pkg-config version check within toolkit/moz.configure in sync
> +with checkout version or increment latest tag by one if it's not based
>diff --git a/www/librewolf.orig/files/patch-libwebrtc-generated b/www/librewolf/files/patch-libwebrtc-generated
>index 5458f3d..a37c7b4 100644
>--- a/www/librewolf.orig/files/patch-libwebrtc-generated
>+++ b/www/librewolf/files/patch-libwebrtc-generated
>@@ -1,8 +1,7 @@
>-commit 3dd423be3774ef9e3e9e9a8f0252a378520918fd
>+commit b3770d8e7f0d6fc220353356066c4c1021f37bde
> Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
>-Date:   Sun Dec 4 21:38:16 2022 +0000
> 
>-    regenerate libwebrtc patch for Firefox 108
>+    regenerate FreeBSD libwebrtc patch for Firefox 109
> 
> 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..ae63fb378f55 100644
>@@ -8583,6 +8582,187 @@ index 24c1fe3c203d..e9b919471baa 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
>  Library("jingle_logging_api_gn")
>+diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
>+index 2fafcbf37fb0..091db6cf5490 100644
>+--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
>++++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
>+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("make_ref_counted_gn")
> diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
> index 841bc83b09cd..d367856e783e 100644
> --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
>@@ -12188,10 +12368,10 @@ index edd79b3ce1a9..4c338c4a44c9 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
>  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..fbf2388bdbfe 100644
>---- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
>-+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
>+diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
>+index c3887b4f2edd..f911e6bcc323 100644
>+--- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
>++++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -12376,11 +12556,11 @@ index caf50afe35c1..fbf2388bdbfe 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..42be461044e1 100644
>---- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
>+ Library("pending_task_safety_flag_gn")
>+diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -12402,7 +12582,7 @@ index 9ebe97971a49..42be461044e1 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -12421,6 +12601,10 @@ index 9ebe97971a49..42be461044e1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -12561,11 +12745,11 @@ index 9ebe97971a49..42be461044e1 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..51fd54da9869 100644
>---- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -12587,7 +12771,7 @@ index 74133ed40fef..51fd54da9869 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -12606,10 +12790,6 @@ index 74133ed40fef..51fd54da9869 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -12675,10 +12855,6 @@ index 74133ed40fef..51fd54da9869 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -12688,6 +12864,10 @@ index 74133ed40fef..51fd54da9869 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -12750,11 +12930,11 @@ index 74133ed40fef..51fd54da9869 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("datagram_transport_interface_gn")
>-diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -12776,7 +12956,7 @@ index 700b5a83f026..0ec2d0d307f7 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -12877,10 +13057,6 @@ index 700b5a83f026..0ec2d0d307f7 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -12943,11 +13119,11 @@ index 700b5a83f026..0ec2d0d307f7 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..c998590d30dc 100644
>---- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
>-+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
>+ Library("datagram_transport_interface_gn")
>+diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -12969,7 +13145,7 @@ index 15ad8475cee5..c998590d30dc 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -12989,7 +13165,6 @@ index 15ad8475cee5..c998590d30dc 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -13018,11 +13193,6 @@ index 15ad8475cee5..c998590d30dc 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -13065,9 +13235,208 @@ index 15ad8475cee5..c998590d30dc 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -17147,7 +17516,7 @@ index 0eef21be59c9..18c24c05b243 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..fecceee6a855 100644
>+index 9c539a9e235d..8472c95023d5 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,20 @@ AllowCompilerWarnings()
>@@ -17171,7 +17540,7 @@ index ebe06a2cc5b2..fecceee6a855 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -19081,7 +19450,7 @@ index 005c7222357d..cdc30aa176db 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..574d68c4f54e 100644
>+index 3a93583c1626..6aed057ed10b 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,20 @@ AllowCompilerWarnings()
>@@ -19105,7 +19474,7 @@ index 3b8aee86312b..574d68c4f54e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -19124,6 +19493,10 @@ index 3b8aee86312b..574d68c4f54e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -19198,6 +19571,10 @@ index 3b8aee86312b..574d68c4f54e 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -19262,7 +19639,7 @@ index 3b8aee86312b..574d68c4f54e 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..716778253e78 100644
>+index 3a056cb30770..511508ae346e 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,20 @@ AllowCompilerWarnings()
>@@ -19286,7 +19663,7 @@ index 071f18ce405a..716778253e78 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -50,165 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -52,165 +62,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -19454,10 +19831,10 @@ index 071f18ce405a..716778253e78 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
>  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..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
>+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
>+index 660d73625a3f..64f7fb530ab0 100644
>+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
>++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -19479,7 +19856,7 @@ index 7be7d67bee33..621ce78b9680 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -19499,7 +19876,6 @@ index 7be7d67bee33..621ce78b9680 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -19528,11 +19904,6 @@ index 7be7d67bee33..621ce78b9680 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -19575,9 +19946,6 @@ index 7be7d67bee33..621ce78b9680 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -19589,10 +19957,6 @@ index 7be7d67bee33..621ce78b9680 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -19655,11 +20019,11 @@ index 7be7d67bee33..621ce78b9680 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..ded6e4680a88 100644
>---- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
>-+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
>+ Library("video_encoder_factory_template_gn")
>+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
>+index 5c1538f12c71..d56482c79d48 100644
>+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
>++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -19681,7 +20045,7 @@ index c588b3ce0e8f..ded6e4680a88 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -19700,6 +20064,11 @@ index c588b3ce0e8f..ded6e4680a88 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -19725,6 +20094,11 @@ index c588b3ce0e8f..ded6e4680a88 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -19765,6 +20139,13 @@ index c588b3ce0e8f..ded6e4680a88 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -19836,11 +20217,11 @@ index c588b3ce0e8f..ded6e4680a88 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..7b9c37cd58af 100644
>---- third_party/libwebrtc/audio/audio_gn/moz.build
>-+++ third_party/libwebrtc/audio/audio_gn/moz.build
>+ Library("video_encoder_factory_template_libvpx_vp8_adapter_gn")
>+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
>+index 4535eb0ef68d..fae75a782896 100644
>+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
>++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -19862,7 +20243,7 @@ index 333c77706b0d..7b9c37cd58af 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -54,174 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -19972,10 +20353,6 @@ index 333c77706b0d..7b9c37cd58af 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -20038,11 +20415,11 @@ index 333c77706b0d..7b9c37cd58af 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("audio_gn")
>-diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
>-index 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
>+ Library("video_encoder_factory_template_libvpx_vp9_adapter_gn")
>+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
>+index 710652e8bc49..eabb80269a3c 100644
>+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
>++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -20064,7 +20441,7 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,172 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -20084,6 +20461,7 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -20113,6 +20491,7 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -20172,10 +20551,6 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -20238,11 +20613,11 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("audio_frame_operations_gn")
>-diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
>-index 3c1d8cc5e85a..f975048caa6c 100644
>---- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
>-+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
>+ Library("video_encoder_factory_template_open_h264_adapter_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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -20264,7 +20639,7 @@ index 3c1d8cc5e85a..f975048caa6c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -50,174 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -20440,11 +20815,11 @@ index 3c1d8cc5e85a..f975048caa6c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("resource_adaptation_gn")
>-diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
>-index 8e41f2704f3c..f8d69690a873 100644
>---- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
>-+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -20466,7 +20841,7 @@ index 8e41f2704f3c..f8d69690a873 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -20485,10 +20860,6 @@ index 8e41f2704f3c..f8d69690a873 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -20554,10 +20925,6 @@ index 8e41f2704f3c..f8d69690a873 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -20629,11 +20996,11 @@ index 8e41f2704f3c..f8d69690a873 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("audio_sender_interface_gn")
>-diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
>-index 0e14a5d16836..81e9778691b7 100644
>---- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
>-+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
>+ 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..7b9c37cd58af 100644
>+--- third_party/libwebrtc/audio/audio_gn/moz.build
>++++ third_party/libwebrtc/audio/audio_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -20655,7 +21022,7 @@ index 0e14a5d16836..81e9778691b7 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -54,174 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -20675,6 +21042,7 @@ index 0e14a5d16836..81e9778691b7 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -20704,6 +21072,7 @@ index 0e14a5d16836..81e9778691b7 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -20829,11 +21198,11 @@ index 0e14a5d16836..81e9778691b7 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("bitrate_allocator_gn")
>-diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
>-index 4e17c8a7a6e4..4031e4169cf6 100644
>---- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
>-+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -20855,7 +21224,7 @@ index 4e17c8a7a6e4..4031e4169cf6 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,172 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -20875,7 +21244,6 @@ index 4e17c8a7a6e4..4031e4169cf6 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -20905,7 +21273,6 @@ index 4e17c8a7a6e4..4031e4169cf6 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "dl",
> -        "rt"
> -    ]
> -
>@@ -21031,11 +21398,11 @@ index 4e17c8a7a6e4..4031e4169cf6 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("bitrate_configurator_gn")
>-diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
>-index 8a43be523080..efd9bf279328 100644
>---- third_party/libwebrtc/call/call_gn/moz.build
>-+++ third_party/libwebrtc/call/call_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -21057,7 +21424,7 @@ index 8a43be523080..efd9bf279328 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -50,174 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -21233,11 +21600,11 @@ index 8a43be523080..efd9bf279328 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("call_gn")
>-diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
>-index fa81c96c30ba..811eabde6332 100644
>---- third_party/libwebrtc/call/call_interfaces_gn/moz.build
>-+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -21259,7 +21626,7 @@ index fa81c96c30ba..811eabde6332 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -21279,7 +21646,6 @@ index fa81c96c30ba..811eabde6332 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -21308,11 +21674,6 @@ index fa81c96c30ba..811eabde6332 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -21355,9 +21716,6 @@ index fa81c96c30ba..811eabde6332 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -21369,10 +21727,6 @@ index fa81c96c30ba..811eabde6332 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -21435,11 +21789,11 @@ index fa81c96c30ba..811eabde6332 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("call_interfaces_gn")
>-diff --git third_party/libwebrtc/call/fake_network_gn/moz.build third_party/libwebrtc/call/fake_network_gn/moz.build
>-index 6641aaf07204..e8dd8acc81b8 100644
>---- third_party/libwebrtc/call/fake_network_gn/moz.build
>-+++ third_party/libwebrtc/call/fake_network_gn/moz.build
>+ 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..81e9778691b7 100644
>+--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
>++++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -21461,7 +21815,7 @@ index 6641aaf07204..e8dd8acc81b8 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -21481,7 +21835,6 @@ index 6641aaf07204..e8dd8acc81b8 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -21511,7 +21864,6 @@ index 6641aaf07204..e8dd8acc81b8 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "dl",
> -        "rt"
> -    ]
> -
>@@ -21637,11 +21989,11 @@ index 6641aaf07204..e8dd8acc81b8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..3dc41cf90cd8 100644
>---- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
>-+++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
>+ 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..4031e4169cf6 100644
>+--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
>++++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -21663,7 +22015,7 @@ index a7006906326a..3dc41cf90cd8 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -21773,6 +22125,10 @@ index a7006906326a..3dc41cf90cd8 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -21835,11 +22191,11 @@ index a7006906326a..3dc41cf90cd8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..8de25ccf5453 100644
>---- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
>-+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
>+ Library("bitrate_configurator_gn")
>+diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
>+index 8a43be523080..efd9bf279328 100644
>+--- third_party/libwebrtc/call/call_gn/moz.build
>++++ third_party/libwebrtc/call/call_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -21861,7 +22217,7 @@ index 9a4504208de8..8de25ccf5453 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -22037,11 +22393,11 @@ index 9a4504208de8..8de25ccf5453 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("rtp_interfaces_gn")
>-diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
>-index f245b8fe8a5f..f57bb730b3c9 100644
>---- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
>-+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
>+ 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..811eabde6332 100644
>+--- third_party/libwebrtc/call/call_interfaces_gn/moz.build
>++++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -22063,7 +22419,7 @@ index f245b8fe8a5f..f57bb730b3c9 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -22239,11 +22595,11 @@ index f245b8fe8a5f..f57bb730b3c9 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("rtp_receiver_gn")
>-diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
>-index 56e1d8324603..4f93f4988594 100644
>---- third_party/libwebrtc/call/rtp_sender_gn/moz.build
>-+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
>+ 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..e8dd8acc81b8 100644
>+--- third_party/libwebrtc/call/fake_network_gn/moz.build
>++++ third_party/libwebrtc/call/fake_network_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -22265,7 +22621,7 @@ index 56e1d8324603..4f93f4988594 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -22441,11 +22797,11 @@ index 56e1d8324603..4f93f4988594 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("rtp_sender_gn")
>-diff --git third_party/libwebrtc/call/simulated_network_gn/moz.build third_party/libwebrtc/call/simulated_network_gn/moz.build
>-index dc88d9e8c718..0d858916f24b 100644
>---- third_party/libwebrtc/call/simulated_network_gn/moz.build
>-+++ third_party/libwebrtc/call/simulated_network_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -22467,7 +22823,7 @@ index dc88d9e8c718..0d858916f24b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -22577,10 +22933,6 @@ index dc88d9e8c718..0d858916f24b 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -22643,11 +22995,11 @@ index dc88d9e8c718..0d858916f24b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("simulated_network_gn")
>-diff --git third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
>-index 08140f915b20..46df12c957ef 100644
>---- third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
>-+++ third_party/libwebrtc/call/simulated_packet_receiver_gn/moz.build
>+ 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..8de25ccf5453 100644
>+--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
>++++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -22669,7 +23021,7 @@ index 08140f915b20..46df12c957ef 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -22779,6 +23131,10 @@ index 08140f915b20..46df12c957ef 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -22841,11 +23197,11 @@ index 08140f915b20..46df12c957ef 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..b0a2d081546a 100644
>---- third_party/libwebrtc/call/version_gn/moz.build
>-+++ third_party/libwebrtc/call/version_gn/moz.build
>+ 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..f57bb730b3c9 100644
>+--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
>++++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -22867,7 +23223,7 @@ index 6f82bc3c2801..b0a2d081546a 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -22886,6 +23242,11 @@ index 6f82bc3c2801..b0a2d081546a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -22911,6 +23272,11 @@ index 6f82bc3c2801..b0a2d081546a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -22951,6 +23317,13 @@ index 6f82bc3c2801..b0a2d081546a 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -23026,11 +23399,11 @@ index 6f82bc3c2801..b0a2d081546a 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..162f225011f8 100644
>---- third_party/libwebrtc/call/video_stream_api_gn/moz.build
>-+++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
>+ 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..4f93f4988594 100644
>+--- third_party/libwebrtc/call/rtp_sender_gn/moz.build
>++++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -23052,7 +23425,7 @@ index ee981f9452bc..162f225011f8 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -23228,19 +23601,19 @@ index ee981f9452bc..162f225011f8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,20 @@ CXXFLAGS += [
>+ 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..0d858916f24b 100644
>+--- third_party/libwebrtc/call/simulated_network_gn/moz.build
>++++ third_party/libwebrtc/call/simulated_network_gn/moz.build
>+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
> +DEFINES["WEBRTC_BSD"] = True
>- DEFINES["WEBRTC_ENABLE_AVX2"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>@@ -23254,7 +23627,7 @@ index df7f52b4c647..4d14cdd35d47 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -48,127 +57,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -23266,6 +23639,7 @@ index df7f52b4c647..4d14cdd35d47 100644
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>@@ -23273,11 +23647,13 @@ index df7f52b4c647..4d14cdd35d47 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -23295,13 +23671,13 @@ index df7f52b4c647..4d14cdd35d47 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -23311,6 +23687,7 @@ index df7f52b4c647..4d14cdd35d47 100644
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
> -    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -23326,6 +23703,7 @@ index df7f52b4c647..4d14cdd35d47 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -23350,148 +23728,6 @@ index df7f52b4c647..4d14cdd35d47 100644
> -        "secur32",
> -        "winmm"
> -    ]
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>-     DEFINES["_DEBUG"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+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 += [
>--        "android_support"
>--    ]
>--
>- 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..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,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -37,158 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -23501,15 +23737,14 @@ index 9a7a8fa7cc91..263d4c990206 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>--    SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse_arm.S",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -23568,11 +23803,11 @@ index 9a7a8fa7cc91..263d4c990206 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..b243ab2af3be 100644
>---- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
>-+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -23594,23 +23829,7 @@ index 625fcd103a7b..b243ab2af3be 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -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",
>-+    "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>-     "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
>-     "/third_party/libwebrtc/common_audio/signal_processing/copy_set_operations.c",
>-     "/third_party/libwebrtc/common_audio/signal_processing/cross_correlation.c",
>-@@ -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",
>-+    "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
>-     "/third_party/libwebrtc/common_audio/signal_processing/filter_ma_fast_q12.c",
>-     "/third_party/libwebrtc/common_audio/signal_processing/get_hanning_window.c",
>-     "/third_party/libwebrtc/common_audio/signal_processing/get_scaling_square.c",
>-@@ -79,228 +91,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -23630,6 +23849,7 @@ index 625fcd103a7b..b243ab2af3be 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -23643,11 +23863,6 @@ index 625fcd103a7b..b243ab2af3be 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_AURA"] = "1"
>@@ -23664,6 +23879,7 @@ index 625fcd103a7b..b243ab2af3be 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -23681,11 +23897,6 @@ index 625fcd103a7b..b243ab2af3be 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -23719,11 +23930,6 @@ index 625fcd103a7b..b243ab2af3be 100644
> -        "secur32",
> -        "winmm"
> -    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -23733,21 +23939,10 @@ index 625fcd103a7b..b243ab2af3be 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>--if CONFIG["CPU_ARCH"] == "ppc64":
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -23773,13 +23968,6 @@ index 625fcd103a7b..b243ab2af3be 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -23793,28 +23981,11 @@ index 625fcd103a7b..b243ab2af3be 100644
> -        "android_support"
> -    ]
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -23825,26 +23996,16 @@ index 625fcd103a7b..b243ab2af3be 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>--        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>--    ]
>--
>- 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..c2d49a2321a2 100644
>---- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
>-+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
>+ 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..b0a2d081546a 100644
>+--- third_party/libwebrtc/call/version_gn/moz.build
>++++ third_party/libwebrtc/call/version_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -23866,7 +24027,7 @@ index 241c8788eb2f..c2d49a2321a2 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -23885,10 +24046,6 @@ index 241c8788eb2f..c2d49a2321a2 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -23914,10 +24071,6 @@ index 241c8788eb2f..c2d49a2321a2 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -23958,13 +24111,6 @@ index 241c8788eb2f..c2d49a2321a2 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -24040,11 +24186,11 @@ index 241c8788eb2f..c2d49a2321a2 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..ffb2fa21e12d 100644
>---- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
>-+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -24066,7 +24212,7 @@ index d81fd8f09ca0..ffb2fa21e12d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -54,172 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -24086,6 +24232,7 @@ index d81fd8f09ca0..ffb2fa21e12d 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -24115,6 +24262,7 @@ index d81fd8f09ca0..ffb2fa21e12d 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -24240,22 +24388,20 @@ index d81fd8f09ca0..ffb2fa21e12d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,22 @@ AllowCompilerWarnings()
>+ 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..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,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["WEBRTC_ARCH_ARM64"] = True
> +DEFINES["WEBRTC_BSD"] = True
>  DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_HAS_NEON"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -24268,7 +24414,7 @@ index 0bb21dcc6f81..97a4c56f1a5b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,148 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -48,127 +57,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -24292,7 +24438,6 @@ index 0bb21dcc6f81..97a4c56f1a5b 100644
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -24325,7 +24470,6 @@ index 0bb21dcc6f81..97a4c56f1a5b 100644
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_BSD"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>@@ -24342,7 +24486,6 @@ index 0bb21dcc6f81..97a4c56f1a5b 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -24368,14 +24511,164 @@ index 0bb21dcc6f81..97a4c56f1a5b 100644
> -        "winmm"
> -    ]
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>--    CFLAGS += [
>--        "-mfpu=neon"
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
> -    ]
>+-
>+ 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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -37,158 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
> -
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-    SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse_arm.S",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S"
>+-    ]
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -24391,8 +24684,8 @@ index 0bb21dcc6f81..97a4c56f1a5b 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"
>@@ -24402,10 +24695,6 @@ index 0bb21dcc6f81..97a4c56f1a5b 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -24413,26 +24702,46 @@ index 0bb21dcc6f81..97a4c56f1a5b 100644
> -        "unwind"
> -    ]
> -
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,22 @@ AllowCompilerWarnings()
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_ARCH_ARM64"] = True
> +DEFINES["WEBRTC_BSD"] = True
>- DEFINES["WEBRTC_ENABLE_AVX2"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_HAS_NEON"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -24445,7 +24754,23 @@ index 05386adf23c5..30ffc38e65fd 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -44,148 +54,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -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",
>++    "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+     "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
>+     "/third_party/libwebrtc/common_audio/signal_processing/copy_set_operations.c",
>+     "/third_party/libwebrtc/common_audio/signal_processing/cross_correlation.c",
>+@@ -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",
>++    "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
>+     "/third_party/libwebrtc/common_audio/signal_processing/filter_ma_fast_q12.c",
>+     "/third_party/libwebrtc/common_audio/signal_processing/get_hanning_window.c",
>+     "/third_party/libwebrtc/common_audio/signal_processing/get_scaling_square.c",
>+@@ -79,228 +91,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -24457,6 +24782,7 @@ index 05386adf23c5..30ffc38e65fd 100644
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>@@ -24469,7 +24795,7 @@ index 05386adf23c5..30ffc38e65fd 100644
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -24477,6 +24803,11 @@ index 05386adf23c5..30ffc38e65fd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_AURA"] = "1"
>@@ -24487,7 +24818,6 @@ index 05386adf23c5..30ffc38e65fd 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
>@@ -24502,8 +24832,8 @@ index 05386adf23c5..30ffc38e65fd 100644
> -    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
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -24511,6 +24841,11 @@ index 05386adf23c5..30ffc38e65fd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -24519,7 +24854,7 @@ index 05386adf23c5..30ffc38e65fd 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -24545,14 +24880,33 @@ index 05386adf23c5..30ffc38e65fd 100644
> -        "winmm"
> -    ]
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>+-    CFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "ppc64":
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>+-    ]
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -24568,8 +24922,8 @@ index 05386adf23c5..30ffc38e65fd 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"
>@@ -24581,7 +24935,10 @@ index 05386adf23c5..30ffc38e65fd 100644
>  
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
> -
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
>+-    ]
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -24590,192 +24947,64 @@ index 05386adf23c5..30ffc38e65fd 100644
> -        "unwind"
> -    ]
> -
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--
>- 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..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,27 @@
>- COMPILE_FLAGS["OS_INCLUDES"] = []
>- AllowCompilerWarnings()
>- 
>-+CXXFLAGS += [
>-+    "-msse2"
>-+]
>-+
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>- DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -43,143 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>--        "log"
>+-        "android_support"
> -    ]
> -
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    CXXFLAGS += [
>--        "-msse2"
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
> -    ]
> -
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
> -
>--    CXXFLAGS += [
>--        "-msse2"
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
> -    ]
> -
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
> -    ]
> -
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["OS_TARGET"] == "WINNT":
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
> -    ]
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>-     DEFINES["_DEBUG"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--    OS_LIBS += [
>--        "android_support"
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
>+-        "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
> -    ]
> -
>- 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..93b9d78370f1 100644
>---- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
>-+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -24797,7 +25026,7 @@ index 47f99dbd830c..93b9d78370f1 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -24971,11 +25200,11 @@ index 47f99dbd830c..93b9d78370f1 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..6ed17d2eb8dd 100644
>---- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
>-+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -24997,7 +25226,7 @@ index 51acac9bad1a..6ed17d2eb8dd 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -54,172 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -25016,6 +25245,10 @@ index 51acac9bad1a..6ed17d2eb8dd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -25041,6 +25274,10 @@ index 51acac9bad1a..6ed17d2eb8dd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -25081,6 +25318,13 @@ index 51acac9bad1a..6ed17d2eb8dd 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -25090,6 +25334,10 @@ index 51acac9bad1a..6ed17d2eb8dd 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -25152,20 +25400,22 @@ index 51acac9bad1a..6ed17d2eb8dd 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,20 @@ AllowCompilerWarnings()
>+ 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..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,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_ARCH_ARM64"] = True
> +DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -25178,7 +25428,7 @@ index b1047de5ccb2..128eb766d596 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,148 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -25190,7 +25440,6 @@ index b1047de5ccb2..128eb766d596 100644
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>@@ -25203,7 +25452,7 @@ index b1047de5ccb2..128eb766d596 100644
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -25221,6 +25470,7 @@ index b1047de5ccb2..128eb766d596 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
>@@ -25235,8 +25485,8 @@ index b1047de5ccb2..128eb766d596 100644
> -    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
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -25252,7 +25502,7 @@ index b1047de5ccb2..128eb766d596 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -25277,18 +25527,15 @@ index b1047de5ccb2..128eb766d596 100644
> -        "secur32",
> -        "winmm"
> -    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>+-
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -25304,8 +25551,8 @@ index b1047de5ccb2..128eb766d596 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"
>@@ -25315,6 +25562,10 @@ index b1047de5ccb2..128eb766d596 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -25322,46 +25573,26 @@ index b1047de5ccb2..128eb766d596 100644
> -        "unwind"
> -    ]
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -
>- 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..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,20 @@ AllowCompilerWarnings()
>+ 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..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,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_ARCH_ARM64"] = True
> +DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -25374,7 +25605,7 @@ index 142887be2aeb..24ac42fb0329 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,101 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,148 +54,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -25386,7 +25617,6 @@ index 142887be2aeb..24ac42fb0329 100644
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>@@ -25399,7 +25629,7 @@ index 142887be2aeb..24ac42fb0329 100644
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -25417,6 +25647,7 @@ index 142887be2aeb..24ac42fb0329 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
>@@ -25431,8 +25662,8 @@ index 142887be2aeb..24ac42fb0329 100644
> -    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
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -25448,7 +25679,7 @@ index 142887be2aeb..24ac42fb0329 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -25473,41 +25704,15 @@ index 142887be2aeb..24ac42fb0329 100644
> -        "secur32",
> -        "winmm"
> -    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- 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"
>-     ]
>- 
>+-
> -if CONFIG["CPU_ARCH"] == "arm":
>-+if CONFIG["CPU_ARCH"] == "x86":
>- 
>-     CXXFLAGS += [
>+-
>+-    CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
>-+        "-msse2"
>-     ]
>- 
>--if CONFIG["CPU_ARCH"] == "x86":
>--
>-     UNIFIED_SOURCES += [
>-         "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
>-     ]
>- 
>- if CONFIG["CPU_ARCH"] == "x86_64":
>- 
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
>--    ]
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -25523,15 +25728,20 @@ index 142887be2aeb..24ac42fb0329 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":
>++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["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -25540,79 +25750,30 @@ index 142887be2aeb..24ac42fb0329 100644
> -        "unwind"
> -    ]
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
>--
>-     CXXFLAGS += [
>-         "-msse2"
>-     ]
>- 
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    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":
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>-+    DEFINES["USE_X11"] = "1"
>+ 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..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,27 @@
>+ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>  
>- 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..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,20 @@ AllowCompilerWarnings()
>++CXXFLAGS += [
>++    "-msse2"
>++]
>++
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
> +DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>@@ -25626,28 +25787,38 @@ index b007a1e5ed8d..d6be72cf693c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,143 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
> -
> -if CONFIG["OS_TARGET"] == "Android":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -25657,6 +25828,10 @@ index b007a1e5ed8d..d6be72cf693c 100644
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["USE_AURA"] = "1"
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_NSS_CERTS"] = "1"
>@@ -25665,18 +25840,26 @@ index b007a1e5ed8d..d6be72cf693c 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
> -    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -25692,7 +25875,6 @@ index b007a1e5ed8d..d6be72cf693c 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -25710,23 +25892,14 @@ index b007a1e5ed8d..d6be72cf693c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
> -    ]
> -
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -25741,8 +25914,8 @@ index b007a1e5ed8d..d6be72cf693c 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"
>@@ -25752,44 +25925,17 @@ index b007a1e5ed8d..d6be72cf693c 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
> -        "android_support"
> -    ]
> -
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -25811,18 +25957,7 @@ index ec6e2eca861f..7b51a5386c8d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -28,6 +38,10 @@ LOCAL_INCLUDES += [
>-     "/tools/profiler/public"
>- ]
>- 
>-+UNIFIED_SOURCES += [
>-+    "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>-+]
>-+
>- if not CONFIG["MOZ_DEBUG"]:
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>-@@ -37,203 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -25841,6 +25976,10 @@ index ec6e2eca861f..7b51a5386c8d 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -25851,10 +25990,6 @@ index ec6e2eca861f..7b51a5386c8d 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_AURA"] = "1"
>@@ -25870,6 +26005,10 @@ index ec6e2eca861f..7b51a5386c8d 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -25884,10 +26023,6 @@ index ec6e2eca861f..7b51a5386c8d 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -25915,8 +26050,11 @@ index ec6e2eca861f..7b51a5386c8d 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>  
>@@ -25927,20 +26065,14 @@ index ec6e2eca861f..7b51a5386c8d 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>--    SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "ppc64":
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -25966,12 +26098,6 @@ index ec6e2eca861f..7b51a5386c8d 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -25985,25 +26111,11 @@ index ec6e2eca861f..7b51a5386c8d 100644
> -        "android_support"
> -    ]
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -26014,24 +26126,16 @@ index ec6e2eca861f..7b51a5386c8d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>--    ]
>--
>- 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..8d71417aa908 100644
>---- third_party/libwebrtc/common_video/common_video_gn/moz.build
>-+++ third_party/libwebrtc/common_video/common_video_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -26053,7 +26157,7 @@ index 369cdc3ac64d..8d71417aa908 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -55,174 +65,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -26072,11 +26176,6 @@ index 369cdc3ac64d..8d71417aa908 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -26102,11 +26201,6 @@ index 369cdc3ac64d..8d71417aa908 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -26147,13 +26241,6 @@ index 369cdc3ac64d..8d71417aa908 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -26163,10 +26250,6 @@ index 369cdc3ac64d..8d71417aa908 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -26229,11 +26312,11 @@ index 369cdc3ac64d..8d71417aa908 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..1e284ffb51df 100644
>---- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
>-+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -26255,7 +26338,7 @@ index d1be405adf26..1e284ffb51df 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -26274,6 +26357,10 @@ index d1be405adf26..1e284ffb51df 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -26299,6 +26386,10 @@ index d1be405adf26..1e284ffb51df 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -26339,6 +26430,13 @@ index d1be405adf26..1e284ffb51df 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -26410,11 +26508,11 @@ index d1be405adf26..1e284ffb51df 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -26436,7 +26534,7 @@ index 651826f452fe..061cfc842908 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,101 +51,7 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -26484,6 +26582,10 @@ index 651826f452fe..061cfc842908 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -26524,16 +26626,25 @@ index 651826f452fe..061cfc842908 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>  
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>+@@ -146,117 +62,28 @@ if CONFIG["CPU_ARCH"] == "aarch64":
>+         "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
>+     ]
>  
> -if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>++if CONFIG["CPU_ARCH"] == "x86":
>+ 
>+     CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -26541,6 +26652,23 @@ index 651826f452fe..061cfc842908 100644
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
>++        "-msse2"
>+     ]
>+ 
>+-if CONFIG["CPU_ARCH"] == "x86":
>+-
>+     UNIFIED_SOURCES += [
>+         "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
>+     ]
>+ 
>+ if CONFIG["CPU_ARCH"] == "x86_64":
>+ 
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc"
>+-    ]
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -26562,10 +26690,9 @@ index 651826f452fe..061cfc842908 100644
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
> -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -26575,10 +26702,26 @@ index 651826f452fe..061cfc842908 100644
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    OS_LIBS += [
> -        "android_support"
> -    ]
> -
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+     CXXFLAGS += [
>+         "-msse2"
>+     ]
>+ 
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -26591,19 +26734,37 @@ index 651826f452fe..061cfc842908 100644
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    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":
> -
>- 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..b06802646e84 100644
>---- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>++    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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -26625,7 +26786,7 @@ index fc4a82d00bde..b06802646e84 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -26644,10 +26805,6 @@ index fc4a82d00bde..b06802646e84 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -26713,10 +26870,6 @@ index fc4a82d00bde..b06802646e84 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -26792,11 +26945,11 @@ index fc4a82d00bde..b06802646e84 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..b41ba4eddf9e 100644
>---- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -26818,7 +26971,18 @@ index 49e8f523ed87..b41ba4eddf9e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -46,165 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -28,6 +38,10 @@ LOCAL_INCLUDES += [
>+     "/tools/profiler/public"
>+ ]
>+ 
>++UNIFIED_SOURCES += [
>++    "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>++]
>++
>+ if not CONFIG["MOZ_DEBUG"]:
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+@@ -37,203 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -26837,10 +27001,6 @@ index 49e8f523ed87..b41ba4eddf9e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -26851,6 +27011,10 @@ index 49e8f523ed87..b41ba4eddf9e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_AURA"] = "1"
>@@ -26880,6 +27044,10 @@ index 49e8f523ed87..b41ba4eddf9e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -26907,8 +27075,8 @@ index 49e8f523ed87..b41ba4eddf9e 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--    OS_LIBS += [
>--        "winmm"
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
> -    ]
> +    DEFINES["_DEBUG"] = True
>  
>@@ -26919,14 +27087,20 @@ index 49e8f523ed87..b41ba4eddf9e 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>+-    SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "ppc64":
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -26952,6 +27126,12 @@ index 49e8f523ed87..b41ba4eddf9e 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -26965,11 +27145,25 @@ index 49e8f523ed87..b41ba4eddf9e 100644
> -        "android_support"
> -    ]
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -26980,16 +27174,24 @@ index 49e8f523ed87..b41ba4eddf9e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..292edf8bdf23 100644
>---- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
>+-    ]
>+-
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -27011,7 +27213,7 @@ index 0d6463867101..292edf8bdf23 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -55,174 +65,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -27031,6 +27233,7 @@ index 0d6463867101..292edf8bdf23 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -27059,6 +27262,11 @@ index 0d6463867101..292edf8bdf23 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -27101,6 +27309,9 @@ index 0d6463867101..292edf8bdf23 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -27178,11 +27389,11 @@ index 0d6463867101..292edf8bdf23 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..f652832a8a4d 100644
>---- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -27204,7 +27415,7 @@ index d6d86cdf23c4..f652832a8a4d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,161 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -27223,10 +27434,6 @@ index d6d86cdf23c4..f652832a8a4d 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -27301,10 +27508,6 @@ index d6d86cdf23c4..f652832a8a4d 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -27367,11 +27570,11 @@ index d6d86cdf23c4..f652832a8a4d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..b6028c696a8b 100644
>---- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -27393,7 +27596,7 @@ index 985b84c85042..b6028c696a8b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -27481,10 +27684,6 @@ index 985b84c85042..b6028c696a8b 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -27560,11 +27759,11 @@ index 985b84c85042..b6028c696a8b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..d0d8c7a098d1 100644
>---- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -27586,7 +27785,7 @@ index cc048c7fdad3..d0d8c7a098d1 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -27606,7 +27805,6 @@ index cc048c7fdad3..d0d8c7a098d1 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -27635,11 +27833,6 @@ index cc048c7fdad3..d0d8c7a098d1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -27682,9 +27875,6 @@ index cc048c7fdad3..d0d8c7a098d1 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -27762,11 +27952,11 @@ index cc048c7fdad3..d0d8c7a098d1 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..b65614c9846d 100644
>---- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -27788,7 +27978,7 @@ index b1758b72bf25..b65614c9846d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,165 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -27955,11 +28145,11 @@ index b1758b72bf25..b65614c9846d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..7d67e8476b53 100644
>---- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
>-+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -27981,7 +28171,7 @@ index 0273e154491a..7d67e8476b53 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -28148,11 +28338,11 @@ index 0273e154491a..7d67e8476b53 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..4d2e584f2b12 100644
>---- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
>-+++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -28174,7 +28364,7 @@ index 9fd4c74381a6..4d2e584f2b12 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,161 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -28194,7 +28384,6 @@ index 9fd4c74381a6..4d2e584f2b12 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -28223,11 +28412,6 @@ index 9fd4c74381a6..4d2e584f2b12 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -28268,13 +28452,6 @@ index 9fd4c74381a6..4d2e584f2b12 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -28350,11 +28527,11 @@ index 9fd4c74381a6..4d2e584f2b12 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..c32a7bbe84b4 100644
>---- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
>-+++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -28376,7 +28553,7 @@ index 09893f4183f6..c32a7bbe84b4 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -28396,7 +28573,6 @@ index 09893f4183f6..c32a7bbe84b4 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -28425,11 +28601,6 @@ index 09893f4183f6..c32a7bbe84b4 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -28472,9 +28643,6 @@ index 09893f4183f6..c32a7bbe84b4 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -28552,11 +28720,11 @@ index 09893f4183f6..c32a7bbe84b4 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..63d1adfc9f3f 100644
>---- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
>-+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -28578,7 +28746,7 @@ index b9b963ad03b1..63d1adfc9f3f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -28754,11 +28922,11 @@ index b9b963ad03b1..63d1adfc9f3f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..85b15dbdb123 100644
>---- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
>-+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -28780,7 +28948,7 @@ index b3e48563c04d..85b15dbdb123 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -28799,6 +28967,10 @@ index b3e48563c04d..85b15dbdb123 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -28864,6 +29036,10 @@ index b3e48563c04d..85b15dbdb123 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -28873,6 +29049,10 @@ index b3e48563c04d..85b15dbdb123 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -28935,11 +29115,11 @@ index b3e48563c04d..85b15dbdb123 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..f3ccbadd37d0 100644
>---- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
>-+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -28961,7 +29141,7 @@ index 1bc62c2080fa..f3ccbadd37d0 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -28981,7 +29161,6 @@ index 1bc62c2080fa..f3ccbadd37d0 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -29010,11 +29189,6 @@ index 1bc62c2080fa..f3ccbadd37d0 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -29057,9 +29231,6 @@ index 1bc62c2080fa..f3ccbadd37d0 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -29137,11 +29308,11 @@ index 1bc62c2080fa..f3ccbadd37d0 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -29163,7 +29334,7 @@ index 24f8656db097..b5761737772d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -29183,6 +29354,7 @@ index 24f8656db097..b5761737772d 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -29211,6 +29383,11 @@ index 24f8656db097..b5761737772d 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -29253,6 +29430,9 @@ index 24f8656db097..b5761737772d 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -29330,11 +29510,11 @@ index 24f8656db097..b5761737772d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..2c9f1c45b3ec 100644
>---- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -29356,7 +29536,7 @@ index 3d193a4a3437..2c9f1c45b3ec 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,172 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -29376,6 +29556,7 @@ index 3d193a4a3437..2c9f1c45b3ec 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -29405,6 +29586,7 @@ index 3d193a4a3437..2c9f1c45b3ec 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -29530,11 +29712,11 @@ index 3d193a4a3437..2c9f1c45b3ec 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -29556,7 +29738,7 @@ index 9f3c0d8abda1..846f9f907e72 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -29575,6 +29757,11 @@ index 9f3c0d8abda1..846f9f907e72 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -29600,6 +29787,11 @@ index 9f3c0d8abda1..846f9f907e72 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -29640,6 +29832,13 @@ index 9f3c0d8abda1..846f9f907e72 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -29649,6 +29848,10 @@ index 9f3c0d8abda1..846f9f907e72 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -29711,11 +29914,11 @@ index 9f3c0d8abda1..846f9f907e72 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -29737,7 +29940,7 @@ index 132dbaad9bef..c1648ebdc6da 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -29756,10 +29959,6 @@ index 132dbaad9bef..c1648ebdc6da 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -29825,10 +30024,6 @@ index 132dbaad9bef..c1648ebdc6da 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -29838,10 +30033,6 @@ index 132dbaad9bef..c1648ebdc6da 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -29904,11 +30095,11 @@ index 132dbaad9bef..c1648ebdc6da 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -29930,7 +30121,7 @@ index 725d37c02703..f3ae48b25ffb 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -29950,6 +30141,7 @@ index 725d37c02703..f3ae48b25ffb 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -29979,6 +30171,7 @@ index 725d37c02703..f3ae48b25ffb 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -30104,196 +30297,11 @@ index 725d37c02703..f3ae48b25ffb 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -30315,7 +30323,7 @@ index b65fc49e5237..1a504c38fce1 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -51,172 +61,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -30363,10 +30371,6 @@ index b65fc49e5237..1a504c38fce1 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -30409,9 +30413,6 @@ index b65fc49e5237..1a504c38fce1 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -30489,11 +30490,11 @@ index b65fc49e5237..1a504c38fce1 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -30515,7 +30516,7 @@ index 15764353c966..e9ed99aad0a1 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,172 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -30689,11 +30690,11 @@ index 15764353c966..e9ed99aad0a1 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..3feac0906041 100644
>---- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -30715,7 +30716,7 @@ index ea97f94f457d..3feac0906041 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -30808,10 +30809,6 @@ index ea97f94f457d..3feac0906041 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -30874,11 +30871,11 @@ index ea97f94f457d..3feac0906041 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..88b940e9c6c3 100644
>---- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -30900,7 +30897,7 @@ index 80fb9807c16f..88b940e9c6c3 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -31067,11 +31064,11 @@ index 80fb9807c16f..88b940e9c6c3 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..6af30071257f 100644
>---- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -31093,7 +31090,7 @@ index 87571de3048e..6af30071257f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -31112,6 +31109,10 @@ index 87571de3048e..6af30071257f 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -31137,6 +31138,10 @@ index 87571de3048e..6af30071257f 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -31177,6 +31182,13 @@ index 87571de3048e..6af30071257f 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -31186,7 +31198,7 @@ index 87571de3048e..6af30071257f 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -31252,11 +31264,11 @@ index 87571de3048e..6af30071257f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..8d9f37d48283 100644
>---- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -31278,7 +31290,7 @@ index be80bff2213e..8d9f37d48283 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -31297,10 +31309,6 @@ index be80bff2213e..8d9f37d48283 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -31366,10 +31374,6 @@ index be80bff2213e..8d9f37d48283 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -31445,11 +31449,11 @@ index be80bff2213e..8d9f37d48283 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..64ca7ca1f4fc 100644
>---- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -31471,7 +31475,7 @@ index 771a415b58fe..64ca7ca1f4fc 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -109,172 +119,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -51,172 +61,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -31579,7 +31583,7 @@ index 771a415b58fe..64ca7ca1f4fc 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CFLAGS += [
>+-    CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -31645,11 +31649,11 @@ index 771a415b58fe..64ca7ca1f4fc 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..4927afb7d7e6 100644
>---- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -31671,7 +31675,7 @@ index a652760054da..4927afb7d7e6 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -31845,11 +31849,11 @@ index a652760054da..4927afb7d7e6 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..17649824103d 100644
>---- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
>-+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -31871,7 +31875,7 @@ index 1cf433ded05c..17649824103d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -31964,6 +31968,10 @@ index 1cf433ded05c..17649824103d 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -32026,11 +32034,11 @@ index 1cf433ded05c..17649824103d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("isac_bwinfo_gn")
>-diff --git third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_c_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -32052,7 +32060,7 @@ index 09da7ad6738f..9028bcf4b2b6 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -63,151 +73,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -32100,11 +32108,6 @@ index 09da7ad6738f..9028bcf4b2b6 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "m",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -32147,9 +32150,6 @@ index 09da7ad6738f..9028bcf4b2b6 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -32159,178 +32159,1338 @@ index 09da7ad6738f..9028bcf4b2b6 100644
>      DEFINES["WEBRTC_ARCH_ARM64"] = True
>      DEFINES["WEBRTC_HAS_NEON"] = True
>  
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("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..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,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>+-if CONFIG["CPU_ARCH"] == "arm":
> -
>--    OS_LIBS += [
>--        "winmm"
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
> -    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -109,172 +119,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -63,151 +73,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "m",
>+-        "rt"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
> -
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>@@ -33472,7 +34632,7 @@ index 81572e410402..59bbb7146249 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..baa80fe26989 100644
>+index 032a190b0afc..603b0dd150aa 100644
> --- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
> +++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>@@ -51508,10 +52668,10 @@ index 1d9b39c90ee9..df973d1d6465 100644
>  
>      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..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
>+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 8631744ab1bf..04e39447905c 100644
>+--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
>++++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
> @@ -14,10 +14,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -51533,7 +52693,7 @@ index 809899a92847..329aa27afaf0 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -66,63 +76,25 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -69,62 +79,25 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -51574,7 +52734,6 @@ index 809899a92847..329aa27afaf0 100644
> +    DEFINES["WEBRTC_HAS_NEON"] = True
>  
> -    OS_LIBS += [
>--        "dl",
> -        "rt"
> -    ]
> +if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD":
>@@ -51606,7 +52765,7 @@ index 809899a92847..329aa27afaf0 100644
>  
>      OS_LIBS += [
>          "X11",
>-@@ -151,287 +123,4 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
>+@@ -153,287 +126,4 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
>          "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc"
>      ]
>  
>@@ -51698,7 +52857,7 @@ index 809899a92847..329aa27afaf0 100644
> -    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>+-    SOURCES += [
> -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
> -    ]
> -
>@@ -51753,7 +52912,7 @@ index 809899a92847..329aa27afaf0 100644
> -    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>+-    SOURCES += [
> -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
> -    ]
> -
>@@ -51763,7 +52922,7 @@ index 809899a92847..329aa27afaf0 100644
> -    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>+-    SOURCES += [
> -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
> -    ]
> -
>@@ -51773,7 +52932,7 @@ index 809899a92847..329aa27afaf0 100644
> -    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--    UNIFIED_SOURCES += [
>+-    SOURCES += [
> -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
> -    ]
> -
>@@ -51893,11 +53052,89 @@ index 809899a92847..329aa27afaf0 100644
> -        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
> -    ]
> -
>- Library("desktop_capture_generic_gn")
>-diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
>-index 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
>+ Library("desktop_capture_gn")
>+diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
>+deleted file mode 100644
>+index e884abb54d56..000000000000
>+--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
>++++ /dev/null
>+@@ -1,72 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+-
>+-
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
>+-
>+-CMMFLAGS += [
>+-    "-fobjc-arc"
>+-]
>+-
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
>+-
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["WEBRTC_ENABLE_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["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-Library("desktop_capture_objc_gn")
>+diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -51919,7 +53156,7 @@ index 0c90f71d76bc..3c1d109d7338 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,208 +47,14 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,138 +57,14 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -51949,11 +53186,6 @@ index 0c90f71d76bc..3c1d109d7338 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -51962,24 +53194,12 @@ index 0c90f71d76bc..3c1d109d7338 100644
> -    DEFINES["WEBRTC_BSD"] = True
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["WEBRTC_USE_X11"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "X11",
>--        "Xcomposite",
>--        "Xdamage",
>--        "Xext",
>--        "Xfixes",
>--        "Xrandr",
>--        "Xrender",
>--        "Xtst"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -52006,15 +53226,6 @@ index 0c90f71d76bc..3c1d109d7338 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "d3d11",
>--        "dxgi",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -52024,6 +53235,10 @@ index 0c90f71d76bc..3c1d109d7338 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -52033,18 +53248,6 @@ index 0c90f71d76bc..3c1d109d7338 100644
> -if CONFIG["CPU_ARCH"] == "ppc64":
> -
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_USE_X11"] = True
>--
>--    OS_LIBS += [
>--        "X11",
>--        "Xcomposite",
>--        "Xdamage",
>--        "Xext",
>--        "Xfixes",
>--        "Xrandr",
>--        "Xrender",
>--        "Xtst"
>--    ]
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
> -
>@@ -52080,138 +53283,24 @@ index 0c90f71d76bc..3c1d109d7338 100644
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_USE_X11"] = True
>--
>--    OS_LIBS += [
>--        "X11",
>--        "Xcomposite",
>--        "Xdamage",
>--        "Xext",
>--        "Xfixes",
>--        "Xrandr",
>--        "Xrender",
>--        "Xtst"
>--    ]
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_USE_X11"] = True
>--
>--    OS_LIBS += [
>--        "X11",
>--        "Xcomposite",
>--        "Xdamage",
>--        "Xext",
>--        "Xfixes",
>--        "Xrandr",
>--        "Xrender",
>--        "Xtst"
>--    ]
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_USE_X11"] = True
>--
>--    OS_LIBS += [
>--        "X11",
>--        "Xcomposite",
>--        "Xdamage",
>--        "Xext",
>--        "Xfixes",
>--        "Xrandr",
>--        "Xrender",
>--        "Xtst"
>--    ]
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> +if CONFIG["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 e884abb54d56..000000000000
>---- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
>-+++ /dev/null
>-@@ -1,72 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--CMMFLAGS += [
>--    "-fobjc-arc"
>--]
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["WEBRTC_ENABLE_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["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("desktop_capture_objc_gn")
>-diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
>-index c0ef33e2b342..01dae095db30 100644
>---- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
>-+++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
>+ 
>+diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
>+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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52233,11 +53322,25 @@ index c0ef33e2b342..01dae095db30 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -47,138 +57,14 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
> -
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -52312,19 +53415,13 @@ index c0ef33e2b342..01dae095db30 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>--    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "ppc64":
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>--    DEFINES["USE_X11"] = "1"
>+-    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
> -
>@@ -52342,42 +53439,49 @@ index c0ef33e2b342..01dae095db30 100644
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>-diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
>-index 9cb0e4d6203a..320177a15a95 100644
>---- third_party/libwebrtc/modules/module_api_gn/moz.build
>-+++ third_party/libwebrtc/modules/module_api_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52554,11 +53658,11 @@ index 9cb0e4d6203a..320177a15a95 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("module_api_gn")
>-diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
>-index 03b9f6c4e5e6..4100fd966dea 100644
>---- third_party/libwebrtc/modules/module_api_public_gn/moz.build
>-+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52735,11 +53839,11 @@ index 03b9f6c4e5e6..4100fd966dea 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("module_api_public_gn")
>-diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
>-index 4c59791a1007..12fac51de819 100644
>---- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
>-+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52761,7 +53865,7 @@ index 4c59791a1007..12fac51de819 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -52780,6 +53884,10 @@ index 4c59791a1007..12fac51de819 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -52854,6 +53962,10 @@ index 4c59791a1007..12fac51de819 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -52916,11 +54028,11 @@ index 4c59791a1007..12fac51de819 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("module_fec_api_gn")
>-diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
>-index f03ff5ebcd21..e7500b1da54a 100644
>---- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
>-+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
>+ 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 eb2187efdcd8..beebc743cd97 100644
>+--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
>++++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -52942,7 +54054,7 @@ index f03ff5ebcd21..e7500b1da54a 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -49,174 +59,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -52962,6 +54074,7 @@ index f03ff5ebcd21..e7500b1da54a 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -52990,6 +54103,11 @@ index f03ff5ebcd21..e7500b1da54a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -53030,6 +54148,13 @@ index f03ff5ebcd21..e7500b1da54a 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -53105,13 +54230,13 @@ index f03ff5ebcd21..e7500b1da54a 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("interval_budget_gn")
>-diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
>-index d899917672bd..e7a8d4dd1960 100644
>---- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
>-+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ 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..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,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"
>@@ -53131,7 +54256,7 @@ index d899917672bd..e7a8d4dd1960 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -50,174 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -53,174 +63,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53307,13 +54432,13 @@ index d899917672bd..e7a8d4dd1960 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("pacing_gn")
>-diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
>-index 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,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+ 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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -53333,7 +54458,7 @@ index 7af9c5fc0071..c4b2d55b1a59 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -53,174 +63,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -84,174 +94,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53509,13 +54634,13 @@ index 7af9c5fc0071..c4b2d55b1a59 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ Library("rtp_rtcp_format_gn")
>+diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
>+index 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,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"
>@@ -53535,7 +54660,7 @@ index 800b7ccea105..f5f609138c1e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -84,174 +94,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -93,174 +103,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53711,13 +54836,13 @@ index 800b7ccea105..f5f609138c1e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0"
>+ 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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
>@@ -53737,7 +54862,7 @@ index 4e7d516d4b7f..bb1a3d90307d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -93,174 +103,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53757,7 +54882,6 @@ index 4e7d516d4b7f..bb1a3d90307d 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -53786,11 +54910,6 @@ index 4e7d516d4b7f..bb1a3d90307d 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -53833,9 +54952,6 @@ index 4e7d516d4b7f..bb1a3d90307d 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -53913,11 +55029,196 @@ index 4e7d516d4b7f..bb1a3d90307d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -53939,7 +55240,7 @@ index 7bb5cb10cee9..f2555eb6396b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -53958,10 +55259,6 @@ index 7bb5cb10cee9..f2555eb6396b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -54027,10 +55324,6 @@ index 7bb5cb10cee9..f2555eb6396b 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -54040,7 +55333,7 @@ index 7bb5cb10cee9..f2555eb6396b 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>+-    CFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>@@ -54106,11 +55399,11 @@ index 7bb5cb10cee9..f2555eb6396b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..1f2604f215ba 100644
>---- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
>-+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
>+ Library("g711_3p_gn")
>+diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -54132,7 +55425,7 @@ index f03573036511..1f2604f215ba 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,157 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54291,11 +55584,11 @@ index f03573036511..1f2604f215ba 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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 5b578af55e2d..dba1235df3b3 100644
>+--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
>++++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -54317,7 +55610,7 @@ index 240656c0f3f0..a30888bae720 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,166 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54336,6 +55629,15 @@ index 240656c0f3f0..a30888bae720 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/utility/source/helpers_android.cc",
>+-        "/third_party/libwebrtc/modules/utility/source/jvm_android.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -54410,10 +55712,6 @@ index 240656c0f3f0..a30888bae720 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -54445,6 +55743,10 @@ index 240656c0f3f0..a30888bae720 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    OS_LIBS += [
> -        "android_support",
> -        "unwind"
>@@ -54476,11 +55778,11 @@ index 240656c0f3f0..a30888bae720 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -54502,7 +55804,21 @@ index 3657b2cbe0f6..af48f581b06c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,157 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -28,6 +38,13 @@ LOCAL_INCLUDES += [
>+     "/tools/profiler/public"
>+ ]
>+ 
>++UNIFIED_SOURCES += [
>++    "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>++    "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>++    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>++    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>++]
>++
>+ if not CONFIG["MOZ_DEBUG"]:
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+@@ -37,203 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54521,6 +55837,11 @@ index 3657b2cbe0f6..af48f581b06c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -54546,6 +55867,18 @@ index 3657b2cbe0f6..af48f581b06c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -54560,6 +55893,13 @@ index 3657b2cbe0f6..af48f581b06c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -54586,6 +55926,28 @@ index 3657b2cbe0f6..af48f581b06c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "ole32",
>+-        "oleaut32",
>+-        "secur32",
>+-        "strmiids",
>+-        "user32",
>+-        "winmm"
>+-    ]
>+-
>+-    SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/windows/device_info_ds.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/windows/help_functions_ds.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/windows/sink_filter_ds.cc"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_ds.cc",
>+-        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_factory_windows.cc"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -54595,10 +55957,6 @@ index 3657b2cbe0f6..af48f581b06c 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -54648,6 +56006,10 @@ index 3657b2cbe0f6..af48f581b06c 100644
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>@@ -54661,11 +56023,11 @@ index 3657b2cbe0f6..af48f581b06c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..4cf06f7309d6 100644
>---- third_party/libwebrtc/modules/utility/utility_gn/moz.build
>-+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -54687,7 +56049,7 @@ index 12447a421204..4cf06f7309d6 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,177 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54707,14 +56069,10 @@ index 12447a421204..4cf06f7309d6 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/utility/source/helpers_android.cc",
>--        "/third_party/libwebrtc/modules/utility/source/jvm_android.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -54741,6 +56099,7 @@ index 12447a421204..4cf06f7309d6 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -54866,11 +56225,11 @@ index 12447a421204..4cf06f7309d6 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("utility_gn")
>-diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -54892,21 +56251,7 @@ index d7b98c3a7818..3fcb8eb39e05 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -28,6 +38,13 @@ LOCAL_INCLUDES += [
>-     "/tools/profiler/public"
>- ]
>- 
>-+UNIFIED_SOURCES += [
>-+    "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>-+    "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>-+    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>-+    "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>-+]
>-+
>- if not CONFIG["MOZ_DEBUG"]:
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>-@@ -37,203 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -54926,7 +56271,6 @@ index d7b98c3a7818..3fcb8eb39e05 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -54955,18 +56299,6 @@ index d7b98c3a7818..3fcb8eb39e05 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -54981,13 +56313,6 @@ index d7b98c3a7818..3fcb8eb39e05 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_linux.cc",
>--        "/third_party/libwebrtc/modules/video_capture/linux/video_capture_v4l2.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -55016,26 +56341,8 @@ index d7b98c3a7818..3fcb8eb39e05 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "ole32",
>--        "oleaut32",
>--        "secur32",
>--        "strmiids",
>--        "user32",
> -        "winmm"
> -    ]
>--
>--    SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/windows/device_info_ds.cc",
>--        "/third_party/libwebrtc/modules/video_capture/windows/help_functions_ds.cc",
>--        "/third_party/libwebrtc/modules/video_capture/windows/sink_filter_ds.cc"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_ds.cc",
>--        "/third_party/libwebrtc/modules/video_capture/windows/video_capture_factory_windows.cc"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -55045,6 +56352,10 @@ index d7b98c3a7818..3fcb8eb39e05 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -55094,10 +56405,6 @@ index d7b98c3a7818..3fcb8eb39e05 100644
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>@@ -55111,11 +56418,11 @@ index d7b98c3a7818..3fcb8eb39e05 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -55137,7 +56444,7 @@ index 4cad010d6416..62b8f59f4920 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -55157,7 +56464,6 @@ index 4cad010d6416..62b8f59f4920 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -55186,11 +56492,6 @@ index 4cad010d6416..62b8f59f4920 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -55231,13 +56532,6 @@ index 4cad010d6416..62b8f59f4920 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -55247,10 +56541,6 @@ index 4cad010d6416..62b8f59f4920 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -55313,11 +56603,11 @@ index 4cad010d6416..62b8f59f4920 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -55506,11 +56796,11 @@ index 09766af69824..d381a8730b53 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -55532,7 +56822,7 @@ index d4d71bf7fb4a..7abada72701b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -55552,6 +56842,7 @@ index d4d71bf7fb4a..7abada72701b 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -55580,6 +56871,11 @@ index d4d71bf7fb4a..7abada72701b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -55620,6 +56916,13 @@ index d4d71bf7fb4a..7abada72701b 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -55629,6 +56932,10 @@ index d4d71bf7fb4a..7abada72701b 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -55691,11 +56998,11 @@ index d4d71bf7fb4a..7abada72701b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("codec_globals_headers_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -55884,11 +57191,11 @@ index f3bef360d869..5cd53c990b1f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ Library("aom_av1_decoder_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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -55910,7 +57217,7 @@ index c21b84284b07..dce99512e78b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,174 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -56086,11 +57393,11 @@ index c21b84284b07..dce99512e78b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -56279,11 +57586,213 @@ index 15ec27b21d92..06fc30f5f006 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("frame_helpers_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -56305,7 +57814,7 @@ index c0793ac64532..78ea3bb3a715 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -56353,6 +57862,10 @@ index c0793ac64532..78ea3bb3a715 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -56395,6 +57908,9 @@ index c0793ac64532..78ea3bb3a715 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -56472,11 +57988,11 @@ index c0793ac64532..78ea3bb3a715 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..1cff15f0207c 100644
>---- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
>+ Library("nack_requester_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -56674,11 +58190,11 @@ index 2c74aec10f15..1cff15f0207c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("encoded_frame_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
>-index 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
>+ Library("packet_buffer_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
>+index 2c545af9de6b..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -56867,11 +58383,11 @@ index b39c49bdadc3..8a2b99b5d253 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..80fc8fcc1d90 100644
>---- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
>+ Library("scalability_mode_util_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -56893,7 +58409,7 @@ index 34db2964e210..80fc8fcc1d90 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -48,165 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -56913,7 +58429,6 @@ index 34db2964e210..80fc8fcc1d90 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -56942,11 +58457,6 @@ index 34db2964e210..80fc8fcc1d90 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -56989,9 +58499,6 @@ index 34db2964e210..80fc8fcc1d90 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -57069,11 +58576,11 @@ index 34db2964e210..80fc8fcc1d90 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -57258,11 +58765,11 @@ index 39c9dc872e42..51664e2e391c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..220b9c4c9d1a 100644
>---- third_party/libwebrtc/modules/video_coding/jitter_estimator_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/jitter_estimator_gn/moz.build
>+ Library("scalable_video_controller_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -57284,7 +58791,200 @@ index cf593c373a4d..220b9c4c9d1a 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("svc_rate_allocator_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build
>+index fe230f262d9d..943834d76711 100644
>+--- third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/timing/codec_timer_gn/moz.build
>+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -57304,7 +59004,6 @@ index cf593c373a4d..220b9c4c9d1a 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -57333,11 +59032,6 @@ index cf593c373a4d..220b9c4c9d1a 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -57378,13 +59072,6 @@ index cf593c373a4d..220b9c4c9d1a 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -57460,11 +59147,11 @@ index cf593c373a4d..220b9c4c9d1a 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..7e6132c596c6 100644
>---- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
>+ Library("codec_timer_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build
>+index 84a87f2a49a2..71c277b678e7 100644
>+--- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -57486,7 +59173,7 @@ index 82f0c8ee2d1b..7e6132c596c6 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -57534,10 +59221,6 @@ index 82f0c8ee2d1b..7e6132c596c6 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -57578,13 +59261,6 @@ index 82f0c8ee2d1b..7e6132c596c6 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -57660,11 +59336,11 @@ index 82f0c8ee2d1b..7e6132c596c6 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..9f95558376b5 100644
>---- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
>+ Library("inter_frame_delay_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
>+index f45f6f072fd5..3ee24c7a63aa 100644
>+--- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -57862,11 +59538,11 @@ index 12ec6e5913bc..9f95558376b5 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..5f50281931e2 100644
>---- third_party/libwebrtc/modules/video_coding/rtt_filter_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/rtt_filter_gn/moz.build
>+ Library("jitter_estimator_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
>+index 54c90f4fee99..73f8f55bfc5c 100644
>+--- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -58052,10 +59728,10 @@ index 6d5975df6f43..5f50281931e2 100644
> -    DEFINES["_GNU_SOURCE"] = True
> -
>  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..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
>+diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
>+index 7f4e361630f5..692e85478b61 100644
>+--- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
>++++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -58077,7 +59753,7 @@ index 08ac03f56841..fe6268db54ad 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -58125,6 +59801,10 @@ index 08ac03f56841..fe6268db54ad 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -58165,6 +59845,13 @@ index 08ac03f56841..fe6268db54ad 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -58240,11 +59927,11 @@ index 08ac03f56841..fe6268db54ad 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ Library("timing_module_gn")
>+diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -58266,7 +59953,7 @@ index dbd579d02d44..352319713761 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -48,165 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -58286,6 +59973,7 @@ index dbd579d02d44..352319713761 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -58314,6 +60002,11 @@ index dbd579d02d44..352319713761 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -58356,6 +60049,9 @@ index dbd579d02d44..352319713761 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -58433,11 +60129,11 @@ index dbd579d02d44..352319713761 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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 40d6c2fa3440..b2797c97a4b0 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -58459,7 +60155,7 @@ index 8e22ed6814a7..d534ab923de5 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -59,174 +69,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -58479,6 +60175,7 @@ index 8e22ed6814a7..d534ab923de5 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -58507,6 +60204,11 @@ index 8e22ed6814a7..d534ab923de5 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -58547,6 +60249,13 @@ index 8e22ed6814a7..d534ab923de5 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -58622,11 +60331,11 @@ index 8e22ed6814a7..d534ab923de5 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -58648,7 +60357,7 @@ index cb5e4a4bf707..a16be3b05afd 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -52,174 +62,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -58668,6 +60377,7 @@ index cb5e4a4bf707..a16be3b05afd 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -58696,6 +60406,11 @@ index cb5e4a4bf707..a16be3b05afd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -58738,6 +60453,9 @@ index cb5e4a4bf707..a16be3b05afd 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -58815,11 +60533,11 @@ index cb5e4a4bf707..a16be3b05afd 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..7015194d6bea 100644
>---- third_party/libwebrtc/modules/video_coding/timing_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/timing_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -58841,7 +60559,7 @@ index 6d1325709c05..7015194d6bea 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -58861,6 +60579,7 @@ index 6d1325709c05..7015194d6bea 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -58890,6 +60609,7 @@ index 6d1325709c05..7015194d6bea 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -59015,11 +60735,11 @@ index 6d1325709c05..7015194d6bea 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59041,7 +60761,7 @@ index da29622b17bf..01c957b82bfd 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,174 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59061,7 +60781,6 @@ index da29622b17bf..01c957b82bfd 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -59090,11 +60809,6 @@ index da29622b17bf..01c957b82bfd 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -59135,13 +60849,6 @@ index da29622b17bf..01c957b82bfd 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -59217,11 +60924,11 @@ index da29622b17bf..01c957b82bfd 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("video_codec_interface_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59243,7 +60950,7 @@ index 2cb8a184972b..e4a8a6926196 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -60,174 +70,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59419,11 +61126,11 @@ index 2cb8a184972b..e4a8a6926196 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("video_coding_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59445,7 +61152,7 @@ index 1fb1c3455908..8ed800072743 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -52,174 +62,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59621,11 +61328,11 @@ index 1fb1c3455908..8ed800072743 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("video_coding_utility_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
>-index 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
>+ 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 1e8317f46e63..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59647,7 +61354,7 @@ index 68f59decaac9..5374c02be1ab 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59667,7 +61374,6 @@ index 68f59decaac9..5374c02be1ab 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -59696,11 +61402,6 @@ index 68f59decaac9..5374c02be1ab 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -59741,13 +61442,6 @@ index 68f59decaac9..5374c02be1ab 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -59823,11 +61517,11 @@ index 68f59decaac9..5374c02be1ab 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -59849,7 +61543,7 @@ index 6f360d915d5d..653b68087a6c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -59869,6 +61563,7 @@ index 6f360d915d5d..653b68087a6c 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -59897,6 +61592,11 @@ index 6f360d915d5d..653b68087a6c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -59937,6 +61637,13 @@ index 6f360d915d5d..653b68087a6c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -60012,11 +61719,11 @@ index 6f360d915d5d..653b68087a6c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..43721cb39474 100644
>---- third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_coding/webrtc_multiplex_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60038,7 +61745,7 @@ index 2b1679f9417e..43721cb39474 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60214,11 +61921,11 @@ index 2b1679f9417e..43721cb39474 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("webrtc_multiplex_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60240,7 +61947,7 @@ index d4a85cbfc7fe..557f8cce3ace 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -44,174 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60416,11 +62123,11 @@ index d4a85cbfc7fe..557f8cce3ace 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60442,7 +62149,7 @@ index 62a8f103c953..e8019e2d5bc3 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60535,10 +62242,6 @@ index 62a8f103c953..e8019e2d5bc3 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -60601,11 +62304,11 @@ index 62a8f103c953..e8019e2d5bc3 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -60627,7 +62330,7 @@ index 2e8bb42e847e..bd3f307bbc43 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60803,20 +62506,22 @@ index 2e8bb42e847e..bd3f307bbc43 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("webrtc_vp8_temporal_layers_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
>-index 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,20 @@ AllowCompilerWarnings()
>+ 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..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,22 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_ARCH_ARM64"] = True
> +DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_HAS_NEON"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -60829,7 +62534,7 @@ index e3f0d1774eba..36a2e95654f4 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -46,174 +56,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,133 +53,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -60841,21 +62546,15 @@ index e3f0d1774eba..36a2e95654f4 100644
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -60873,23 +62572,19 @@ index e3f0d1774eba..36a2e95654f4 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -60905,7 +62600,7 @@ index e3f0d1774eba..36a2e95654f4 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -60924,19 +62619,6 @@ index e3f0d1774eba..36a2e95654f4 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
> -if CONFIG["CPU_ARCH"] == "arm":
> -
> -    CXXFLAGS += [
>@@ -60945,12 +62627,11 @@ index e3f0d1774eba..36a2e95654f4 100644
> -
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>--    DEFINES["_DEBUG"] = True
>--
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -60972,6 +62653,10 @@ index e3f0d1774eba..36a2e95654f4 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -60979,45 +62664,30 @@ index e3f0d1774eba..36a2e95654f4 100644
> -        "unwind"
> -    ]
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
> -
>- Library("webrtc_vp9_gn")
>-diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
>-index 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,20 @@ AllowCompilerWarnings()
>+ 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..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,27 @@
>+ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>+ 
>++CXXFLAGS += [
>++    "-msse2"
>++]
>++
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
> +DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>@@ -61031,19 +62701,22 @@ index c73282c2ee34..f5f423de241b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -42,143 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
> -
> -if CONFIG["OS_TARGET"] == "Android":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>@@ -61051,13 +62724,15 @@ index c73282c2ee34..f5f423de241b 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -61067,6 +62742,10 @@ index c73282c2ee34..f5f423de241b 100644
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["USE_AURA"] = "1"
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_NSS_CERTS"] = "1"
>@@ -61075,23 +62754,26 @@ index c73282c2ee34..f5f423de241b 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "dl",
> -        "rt"
> -    ]
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
>+-    CXXFLAGS += [
>+-        "-msse2"
>+-    ]
>+-
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
> -    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -61107,7 +62789,6 @@ index c73282c2ee34..f5f423de241b 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -61132,22 +62813,6 @@ index c73282c2ee34..f5f423de241b 100644
> -        "secur32",
> -        "winmm"
> -    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -61163,8 +62828,8 @@ index c73282c2ee34..f5f423de241b 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"
>@@ -61174,44 +62839,294 @@ index c73282c2ee34..f5f423de241b 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>+-        "android_support"
>+-    ]
>+-
>+ Library("video_processing_sse2_gn")
>+diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
>+index 78a668b8646e..69f69fa74b5e 100644
>+--- third_party/libwebrtc/moz.build
>++++ third_party/libwebrtc/moz.build
>+@@ -26,7 +26,9 @@ DIRS += [
>+     "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn",
>+     "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn",
>+     "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn",
>++    "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+     "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn",
>++    "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+     "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn",
>+     "/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn",
>+     "/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn",
>+@@ -171,7 +173,9 @@ DIRS += [
>+     "/third_party/libwebrtc/modules/audio_coding/ilbc_c_gn",
>+     "/third_party/libwebrtc/modules/audio_coding/ilbc_gn",
>+     "/third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn",
>++    "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+     "/third_party/libwebrtc/modules/audio_coding/isac_common_gn",
>++    "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+     "/third_party/libwebrtc/modules/audio_coding/isac_vad_gn",
>+     "/third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn",
>+     "/third_party/libwebrtc/modules/audio_coding/neteq_gn",
>+@@ -264,6 +268,8 @@ DIRS += [
>+     "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
>+     "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
>+     "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
>++    "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>++    "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+     "/third_party/libwebrtc/modules/module_api_gn",
>+     "/third_party/libwebrtc/modules/module_api_public_gn",
>+     "/third_party/libwebrtc/modules/module_fec_api_gn",
>+@@ -460,224 +466,7 @@ DIRS += [
>+     "/third_party/libwebrtc/webrtc_gn"
>+ ]
>+ 
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/rtc_base/ifaddrs_android_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn",
>+-        "/third_party/libwebrtc/sdk/base_objc_gn",
>+-        "/third_party/libwebrtc/sdk/helpers_objc_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/get_activation_factory_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/hstring_gn",
>+-        "/third_party/libwebrtc/rtc_base/win/windows_version_gn",
>+-        "/third_party/libwebrtc/rtc_base/win32_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn",
>+-        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
> -    ]
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
> -
>--    OS_LIBS += [
>--        "android_support"
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
> -    ]
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>+-    ]
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn",
>+-        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn"
>+-    ]
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>+-    ]
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DIRS += [
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>+-        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>+-    ]
> -
>- 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..70a93b65f156 100644
>---- third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
>-+++ third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DIRS += [
>+-        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+-        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>+-        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>+-        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>+-        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT":
>++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DIRS += [
>+         "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>+@@ -685,7 +474,7 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT":
>+         "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>+     ]
>+ 
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
>++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DIRS += [
>+         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+@@ -696,7 +485,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
>+         "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>+     ]
>+ 
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT":
>++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DIRS += [
>+         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>+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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -61233,7 +63148,7 @@ index 0aaecfdf510a..70a93b65f156 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -61252,6 +63167,11 @@ index 0aaecfdf510a..70a93b65f156 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -61317,6 +63237,13 @@ index 0aaecfdf510a..70a93b65f156 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -61326,6 +63253,10 @@ index 0aaecfdf510a..70a93b65f156 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -61388,11 +63319,11 @@ index 0aaecfdf510a..70a93b65f156 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("denoiser_filter_gn")
>-diff --git third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -61414,7 +63345,7 @@ index aa332adfa9a7..2bdd0d2bebbb 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -61463,11 +63394,6 @@ index aa332adfa9a7..2bdd0d2bebbb 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -61590,22 +63516,20 @@ index aa332adfa9a7..2bdd0d2bebbb 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("video_processing_gn")
>-diff --git third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build third_party/libwebrtc/modules/video_processing/video_processing_neon_gn/moz.build
>-index 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,22 @@ AllowCompilerWarnings()
>+ Library("async_socket_gn")
>+diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_ARCH_ARM64"] = True
> +DEFINES["WEBRTC_BSD"] = True
>- DEFINES["WEBRTC_ENABLE_AVX2"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_HAS_NEON"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -61618,7 +63542,7 @@ index 3588b0ac325f..e1d6759739e5 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,133 +53,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -61630,15 +63554,20 @@ index 3588b0ac325f..e1d6759739e5 100644
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -61656,7 +63585,6 @@ index 3588b0ac325f..e1d6759739e5 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
>@@ -61667,8 +63595,8 @@ index 3588b0ac325f..e1d6759739e5 100644
> -    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
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -61684,7 +63612,7 @@ index 3588b0ac325f..e1d6759739e5 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -61703,6 +63631,16 @@ index 3588b0ac325f..e1d6759739e5 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
> -if CONFIG["CPU_ARCH"] == "arm":
> -
> -    CXXFLAGS += [
>@@ -61711,11 +63649,12 @@ index 3588b0ac325f..e1d6759739e5 100644
> -
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>-     DEFINES["_DEBUG"] = True
>- 
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -61737,10 +63676,6 @@ index 3588b0ac325f..e1d6759739e5 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
> -    OS_LIBS += [
>@@ -61748,30 +63683,45 @@ index 3588b0ac325f..e1d6759739e5 100644
> -        "unwind"
> -    ]
> -
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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,27 @@
>- COMPILE_FLAGS["OS_INCLUDES"] = []
>- AllowCompilerWarnings()
>- 
>-+CXXFLAGS += [
>-+    "-msse2"
>-+]
>-+
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
> +DEFINES["WEBRTC_BSD"] = True
>- DEFINES["WEBRTC_ENABLE_AVX2"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>@@ -61785,22 +63735,19 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -42,143 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
> -
> -if CONFIG["OS_TARGET"] == "Android":
> -
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["WEBRTC_ANDROID"] = True
> -    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>@@ -61813,10 +63760,7 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_MAC"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>@@ -61826,10 +63770,6 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
> -    DEFINES["USE_AURA"] = "1"
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_NSS_CERTS"] = "1"
>@@ -61838,26 +63778,18 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644
> -    DEFINES["WEBRTC_LINUX"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
>--    CXXFLAGS += [
>--        "-msse2"
>--    ]
>--
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
> -    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
>@@ -61873,6 +63805,7 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>@@ -61890,14 +63823,23 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
> -
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
> -    ]
> -
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -61912,8 +63854,8 @@ index 9d41f521fdb8..0c3a0c9fcefc 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"
>@@ -61923,304 +63865,44 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644
>  
>      DEFINES["USE_X11"] = "1"
>  
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
>- Library("video_processing_sse2_gn")
>-diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
>-index 3b546257660a..c7fa79488695 100644
>---- third_party/libwebrtc/moz.build
>-+++ third_party/libwebrtc/moz.build
>-@@ -26,7 +26,9 @@ DIRS += [
>-     "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn",
>-     "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn",
>-     "/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn",
>-+    "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>-     "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn",
>-+    "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>-     "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn",
>-     "/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn",
>-     "/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn",
>-@@ -165,7 +167,9 @@ DIRS += [
>-     "/third_party/libwebrtc/modules/audio_coding/ilbc_c_gn",
>-     "/third_party/libwebrtc/modules/audio_coding/ilbc_gn",
>-     "/third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn",
>-+    "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>-     "/third_party/libwebrtc/modules/audio_coding/isac_common_gn",
>-+    "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>-     "/third_party/libwebrtc/modules/audio_coding/isac_vad_gn",
>-     "/third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn",
>-     "/third_party/libwebrtc/modules/audio_coding/neteq_gn",
>-@@ -258,6 +262,9 @@ DIRS += [
>-     "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
>-     "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
>-     "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
>-+    "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>-+    "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>-+    "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>-     "/third_party/libwebrtc/modules/module_api_gn",
>-     "/third_party/libwebrtc/modules/module_api_public_gn",
>-     "/third_party/libwebrtc/modules/module_fec_api_gn",
>-@@ -452,233 +459,7 @@ DIRS += [
>-     "/third_party/libwebrtc/webrtc_gn"
>- ]
>- 
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/rtc_base/ifaddrs_android_gn",
>--        "/third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn",
>--        "/third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn",
>--        "/third_party/libwebrtc/sdk/base_objc_gn",
>--        "/third_party/libwebrtc/sdk/helpers_objc_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn",
>--        "/third_party/libwebrtc/rtc_base/win/get_activation_factory_gn",
>--        "/third_party/libwebrtc/rtc_base/win/hstring_gn",
>--        "/third_party/libwebrtc/rtc_base/win/windows_version_gn",
>--        "/third_party/libwebrtc/rtc_base/win32_gn"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>--    ]
>--
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn",
>--        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
> -    ]
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
> -
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>+-    OS_LIBS += [
>+-        "android_support"
> -    ]
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>--    ]
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_arm_asm_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_common_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_fix_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_neon_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn",
>--        "/third_party/libwebrtc/rtc_base/system/asm_defines_gn"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn"
>--    ]
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>--    ]
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DIRS += [
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
>--        "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
>--        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DIRS += [
>--        "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>--        "/third_party/libwebrtc/common_audio/common_audio_sse2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
>--        "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
>--        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
>--        "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>--    ]
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT":
>-+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DIRS += [
>-         "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
>-@@ -686,7 +467,7 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT":
>-         "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
>-     ]
>- 
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
>-+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DIRS += [
>-         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>-@@ -697,7 +478,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT":
>-         "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
>-     ]
>- 
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT":
>-+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DIRS += [
>-         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
>-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..47fb8bc57c43 100644
>---- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62242,7 +63924,7 @@ index 5628bb3a4ff8..47fb8bc57c43 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -62262,7 +63944,6 @@ index 5628bb3a4ff8..47fb8bc57c43 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -62331,13 +64012,6 @@ index 5628bb3a4ff8..47fb8bc57c43 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -62413,11 +64087,11 @@ index 5628bb3a4ff8..47fb8bc57c43 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..cd84d89e28c8 100644
>---- third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/async_socket_gn/moz.build
>+ Library("bitstream_reader_gn")
>+diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
>+index 153ffc6d7bec..b2d99bd4e310 100644
>+--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62439,7 +64113,7 @@ index 732d8224bb5a..cd84d89e28c8 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -62459,7 +64133,6 @@ index 732d8224bb5a..cd84d89e28c8 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -62528,13 +64201,6 @@ index 732d8224bb5a..cd84d89e28c8 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -62544,10 +64210,6 @@ index 732d8224bb5a..cd84d89e28c8 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -62610,11 +64272,11 @@ index 732d8224bb5a..cd84d89e28c8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..739f29eb59d9 100644
>---- third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/atomicops_gn/moz.build
>+ Library("buffer_gn")
>+diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62636,7 +64298,7 @@ index 8194e6319634..739f29eb59d9 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -62655,6 +64317,10 @@ index 8194e6319634..739f29eb59d9 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -62729,6 +64395,10 @@ index 8194e6319634..739f29eb59d9 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -62791,11 +64461,11 @@ index 8194e6319634..739f29eb59d9 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -62817,7 +64487,7 @@ index 10985c3a09a3..12fe81e90a59 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -62836,10 +64506,6 @@ index 10985c3a09a3..12fe81e90a59 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -62905,10 +64571,6 @@ index 10985c3a09a3..12fe81e90a59 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -62918,10 +64580,6 @@ index 10985c3a09a3..12fe81e90a59 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -62984,11 +64642,11 @@ index 10985c3a09a3..12fe81e90a59 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..d18471cbb946 100644
>---- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63173,11 +64831,11 @@ index b3daad93040a..d18471cbb946 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..ba596983b322 100644
>---- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
>+ 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..cbfd21ec0181 100644
>+--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63362,11 +65020,11 @@ index 5578717236fa..ba596983b322 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..b2d99bd4e310 100644
>---- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
>+ Library("checks_gn")
>+diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63388,7 +65046,7 @@ index 153ffc6d7bec..b2d99bd4e310 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -63407,10 +65065,6 @@ index 153ffc6d7bec..b2d99bd4e310 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -63547,11 +65201,11 @@ index 153ffc6d7bec..b2d99bd4e310 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("buffer_gn")
>-diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
>-index ab65698bbdbc..681652e6c65c 100644
>---- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
>+ Library("compile_assert_c_gn")
>+diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63670,191 +65324,10 @@ index ab65698bbdbc..681652e6c65c 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("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..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,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -63917,11 +65390,11 @@ index 3cda1af49dc2..9f18b513a3e7 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("byte_order_gn")
>-diff --git third_party/libwebrtc/rtc_base/callback_list_gn/moz.build third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
>-index 6c63dc79e25e..9ff476fbcfd0 100644
>---- third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/callback_list_gn/moz.build
>+ Library("flat_containers_internal_gn")
>+diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -63943,7 +65416,7 @@ index 6c63dc79e25e..9ff476fbcfd0 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -64040,10 +65513,191 @@ index 6c63dc79e25e..9ff476fbcfd0 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("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..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,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "log"
> -    ]
> -
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -64106,11 +65760,11 @@ index 6c63dc79e25e..9ff476fbcfd0 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..cbfd21ec0181 100644
>---- third_party/libwebrtc/rtc_base/checks_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
>+ Library("flat_set_gn")
>+diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64295,11 +65949,11 @@ index 1c7ee114d266..cbfd21ec0181 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..89cf3756d48f 100644
>---- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
>+ Library("copy_on_write_buffer_gn")
>+diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>+index 9e2ce84542b5..62e32f186625 100644
>+--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64321,7 +65975,7 @@ index 710110b47814..89cf3756d48f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -64340,6 +65994,10 @@ index 710110b47814..89cf3756d48f 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -64414,6 +66072,10 @@ index 710110b47814..89cf3756d48f 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -64476,11 +66138,11 @@ index 710110b47814..89cf3756d48f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("compile_assert_c_gn")
>-diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64502,7 +66164,7 @@ index aeba5a1f25a5..f2fd0ab3ebab 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -64599,10 +66261,6 @@ index aeba5a1f25a5..f2fd0ab3ebab 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -64665,11 +66323,11 @@ index aeba5a1f25a5..f2fd0ab3ebab 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..a7da0c928a3f 100644
>---- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -64691,7 +66349,7 @@ index 0f8ada65b808..a7da0c928a3f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -64779,191 +66437,10 @@ index 0f8ada65b808..a7da0c928a3f 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("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..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,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "log"
>+-        "winmm"
> -    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -64973,6 +66450,10 @@ index 78923e89eab3..2eb4118af594 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -65035,11 +66516,11 @@ index 78923e89eab3..2eb4118af594 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("flat_set_gn")
>-diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65061,7 +66542,7 @@ index 5a3b34c3eb3f..42099791f250 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -65149,6 +66630,10 @@ index 5a3b34c3eb3f..42099791f250 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -65224,11 +66709,11 @@ index 5a3b34c3eb3f..42099791f250 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..62e32f186625 100644
>---- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
>+ Library("alr_experiment_gn")
>+diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65250,7 +66735,7 @@ index 9e2ce84542b5..62e32f186625 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -65338,6 +66823,10 @@ index 9e2ce84542b5..62e32f186625 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -65413,11 +66902,11 @@ index 9e2ce84542b5..62e32f186625 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..b8aa831636e1 100644
>---- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65439,7 +66928,7 @@ index 0a389c181a0f..b8aa831636e1 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -65527,6 +67016,10 @@ index 0a389c181a0f..b8aa831636e1 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -65536,6 +67029,10 @@ index 0a389c181a0f..b8aa831636e1 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -65598,11 +67095,11 @@ index 0a389c181a0f..b8aa831636e1 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..a2edb19a6a18 100644
>---- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65791,11 +67288,11 @@ index 50d367865f42..a2edb19a6a18 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..74a792863f98 100644
>---- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -65984,11 +67481,11 @@ index 6fae52bb42f3..74a792863f98 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66010,7 +67507,7 @@ index 4e7e01cb33c9..ad9fa6f31eb9 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -66177,11 +67674,11 @@ index 4e7e01cb33c9..ad9fa6f31eb9 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66370,11 +67867,11 @@ index b77512ed7ca4..f883d87512f8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66563,11 +68060,11 @@ index b2eda23031d9..c2aefebf335f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66756,11 +68253,11 @@ index 28b528d00af0..dc663b172140 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -66782,7 +68279,7 @@ index b87d19dcfa02..79155a069937 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -66949,11 +68446,11 @@ index b87d19dcfa02..79155a069937 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("field_trial_parser_gn")
>-diff --git third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67142,11 +68639,11 @@ index d99945875231..8c5e660e2d89 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67335,11 +68832,11 @@ index 4fc29dd00bdc..981a45f0db1c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67528,11 +69025,11 @@ index eb804281b3b4..b1ca07bf3516 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67721,11 +69218,11 @@ index b1c8c0d0f5da..4161e1d2d4c4 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67914,11 +69411,11 @@ index e03ac53c529c..86fc14d049d4 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -67940,7 +69437,7 @@ index 8eab3b601803..589003868373 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -67959,10 +69456,6 @@ index 8eab3b601803..589003868373 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -68028,10 +69521,6 @@ index 8eab3b601803..589003868373 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -68041,10 +69530,6 @@ index 8eab3b601803..589003868373 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -68107,11 +69592,11 @@ index 8eab3b601803..589003868373 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68133,7 +69618,7 @@ index 0d2c512c84c9..0685f26b42d7 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68221,10 +69706,6 @@ index 0d2c512c84c9..0685f26b42d7 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -68300,11 +69781,105 @@ index 0d2c512c84c9..0685f26b42d7 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68326,7 +69901,7 @@ index a2d84caa9cb3..a279d9d22081 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68345,10 +69920,6 @@ index a2d84caa9cb3..a279d9d22081 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -68414,10 +69985,6 @@ index a2d84caa9cb3..a279d9d22081 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -68427,10 +69994,6 @@ index a2d84caa9cb3..a279d9d22081 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -68493,11 +70056,11 @@ index a2d84caa9cb3..a279d9d22081 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68519,7 +70082,7 @@ index 587c408000b8..d03c88253ad4 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68539,6 +70102,7 @@ index 587c408000b8..d03c88253ad4 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -68609,6 +70173,9 @@ index 587c408000b8..d03c88253ad4 100644
> -    DEFINES["__STD_C"] = True
> -
> -    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
> -        "winmm"
> -    ]
> +    DEFINES["_DEBUG"] = True
>@@ -68686,11 +70253,11 @@ index 587c408000b8..d03c88253ad4 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..95ed70141a86 100644
>---- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
>+ 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..61b1ea14bb0e 100644
>+--- third_party/libwebrtc/rtc_base/location_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/location_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68712,7 +70279,7 @@ index 1823f5043239..95ed70141a86 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68805,6 +70372,10 @@ index 1823f5043239..95ed70141a86 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -68867,11 +70438,11 @@ index 1823f5043239..95ed70141a86 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("gtest_prod_gn")
>-diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
>-index 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
>+ 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..1ee3e013fdf4 100644
>+--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -68893,7 +70464,7 @@ index b4a901c6ef51..371cbfdafaa5 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -68981,6 +70552,10 @@ index b4a901c6ef51..371cbfdafaa5 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -69056,105 +70631,11 @@ index b4a901c6ef51..371cbfdafaa5 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    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..fda3fcb7ee03 100644
>---- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
>+ 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..1d52ca24913f 100644
>+--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69331,11 +70812,11 @@ index 7b8ac423f8d1..fda3fcb7ee03 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..fe2c7a08a1a8 100644
>---- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
>+ Library("macromagic_gn")
>+diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69357,7 +70838,7 @@ index 686dd85e6761..fe2c7a08a1a8 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69377,7 +70858,6 @@ index 686dd85e6761..fe2c7a08a1a8 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -69446,13 +70926,6 @@ index 686dd85e6761..fe2c7a08a1a8 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -69528,11 +71001,11 @@ index 686dd85e6761..fe2c7a08a1a8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..61b1ea14bb0e 100644
>---- third_party/libwebrtc/rtc_base/location_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/location_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69554,7 +71027,7 @@ index e5ccd52a24a3..61b1ea14bb0e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69573,6 +71046,10 @@ index e5ccd52a24a3..61b1ea14bb0e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -69647,10 +71124,6 @@ index e5ccd52a24a3..61b1ea14bb0e 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -69713,11 +71186,11 @@ index e5ccd52a24a3..61b1ea14bb0e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..1ee3e013fdf4 100644
>---- third_party/libwebrtc/rtc_base/logging_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69739,7 +71212,7 @@ index 25c1b293e768..1ee3e013fdf4 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69827,10 +71300,6 @@ index 25c1b293e768..1ee3e013fdf4 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -69840,10 +71309,6 @@ index 25c1b293e768..1ee3e013fdf4 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -69906,11 +71371,11 @@ index 25c1b293e768..1ee3e013fdf4 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..1d52ca24913f 100644
>---- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
>+ Library("mod_ops_gn")
>+diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -69932,7 +71397,7 @@ index acc69504c3b6..1d52ca24913f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -69951,6 +71416,10 @@ index acc69504c3b6..1d52ca24913f 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -70087,11 +71556,11 @@ index acc69504c3b6..1d52ca24913f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("macromagic_gn")
>-diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70113,7 +71582,7 @@ index aeb28674b90e..36f62de9f2ec 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70133,6 +71602,7 @@ index aeb28674b90e..36f62de9f2ec 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -70201,6 +71671,13 @@ index aeb28674b90e..36f62de9f2ec 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -70276,11 +71753,11 @@ index aeb28674b90e..36f62de9f2ec 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70302,7 +71779,7 @@ index 3e4d3419f80b..9d6236051c42 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70321,10 +71798,6 @@ index 3e4d3419f80b..9d6236051c42 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -70399,6 +71872,10 @@ index 3e4d3419f80b..9d6236051c42 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -70461,11 +71938,11 @@ index 3e4d3419f80b..9d6236051c42 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("always_valid_pointer_gn")
>-diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
>-index d41b52655bce..522cda07763b 100644
>---- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
>+ Library("sent_packet_gn")
>+diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70487,7 +71964,7 @@ index d41b52655bce..522cda07763b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70584,6 +72061,10 @@ index d41b52655bce..522cda07763b 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -70646,11 +72127,11 @@ index d41b52655bce..522cda07763b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("mod_ops_gn")
>-diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
>-index 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
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70672,7 +72153,7 @@ index 0764466d8e3b..5f2029471f2f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70692,6 +72173,7 @@ index 0764466d8e3b..5f2029471f2f 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -70760,6 +72242,13 @@ index 0764466d8e3b..5f2029471f2f 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -70769,6 +72258,10 @@ index 0764466d8e3b..5f2029471f2f 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -70831,11 +72324,11 @@ index 0764466d8e3b..5f2029471f2f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("moving_max_counter_gn")
>-diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
>-index 9544696f1008..d58709a21a1e 100644
>---- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -70857,7 +72350,7 @@ index 9544696f1008..d58709a21a1e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -70877,7 +72370,6 @@ index 9544696f1008..d58709a21a1e 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -70946,13 +72438,6 @@ index 9544696f1008..d58709a21a1e 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -70962,10 +72447,6 @@ index 9544696f1008..d58709a21a1e 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -71028,11 +72509,11 @@ index 9544696f1008..d58709a21a1e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..1d867252d81c 100644
>---- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
>+ Library("one_time_event_gn")
>+diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71054,7 +72535,7 @@ index e91b1ddbda6c..1d867252d81c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71073,6 +72554,10 @@ index e91b1ddbda6c..1d867252d81c 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -71138,6 +72623,10 @@ index e91b1ddbda6c..1d867252d81c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -71213,11 +72702,11 @@ index e91b1ddbda6c..1d867252d81c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..ba1b2ca9935f 100644
>---- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
>+ Library("platform_thread_gn")
>+diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71239,7 +72728,7 @@ index 14b68b441e64..ba1b2ca9935f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71258,10 +72747,6 @@ index 14b68b441e64..ba1b2ca9935f 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -71402,11 +72887,11 @@ index 14b68b441e64..ba1b2ca9935f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..16674329bbce 100644
>---- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71428,7 +72913,7 @@ index 52ae3bc16660..16674329bbce 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71447,11 +72932,6 @@ index 52ae3bc16660..16674329bbce 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -71517,13 +72997,6 @@ index 52ae3bc16660..16674329bbce 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -71533,10 +73006,6 @@ index 52ae3bc16660..16674329bbce 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -71599,11 +73068,11 @@ index 52ae3bc16660..16674329bbce 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..8485d4793a5e 100644
>---- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
>+ Library("protobuf_utils_gn")
>+diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71625,7 +73094,7 @@ index a10089f6f666..8485d4793a5e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71722,6 +73191,10 @@ index a10089f6f666..8485d4793a5e 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -71784,11 +73257,11 @@ index a10089f6f666..8485d4793a5e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("one_time_event_gn")
>-diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
>-index c759dfd0eebd..96517102c624 100644
>---- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
>+ Library("race_checker_gn")
>+diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
>+index a0f473e42d34..39ae2da973a6 100644
>+--- third_party/libwebrtc/rtc_base/random_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/random_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -71810,7 +73283,7 @@ index c759dfd0eebd..96517102c624 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -71898,10 +73371,6 @@ index c759dfd0eebd..96517102c624 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -71977,11 +73446,11 @@ index c759dfd0eebd..96517102c624 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..506d35309aed 100644
>---- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
>+ Library("random_gn")
>+diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72003,7 +73472,7 @@ index 5962bb527ef7..506d35309aed 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72022,6 +73491,10 @@ index 5962bb527ef7..506d35309aed 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -72047,6 +73520,10 @@ index 5962bb527ef7..506d35309aed 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -72087,6 +73564,13 @@ index 5962bb527ef7..506d35309aed 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -72162,11 +73646,11 @@ index 5962bb527ef7..506d35309aed 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..c1a93ff618ca 100644
>---- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
>+ Library("rate_limiter_gn")
>+diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72188,7 +73672,7 @@ index 48de05c6565d..c1a93ff618ca 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72207,6 +73691,10 @@ index 48de05c6565d..c1a93ff618ca 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -72272,6 +73760,10 @@ index 48de05c6565d..c1a93ff618ca 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -72281,6 +73773,10 @@ index 48de05c6565d..c1a93ff618ca 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -72343,11 +73839,11 @@ index 48de05c6565d..c1a93ff618ca 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("protobuf_utils_gn")
>-diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
>-index e1eee7aaa3b1..f23e850ec5b3 100644
>---- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
>+ Library("rate_statistics_gn")
>+diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72369,7 +73865,7 @@ index e1eee7aaa3b1..f23e850ec5b3 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72457,6 +73953,10 @@ index e1eee7aaa3b1..f23e850ec5b3 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -72532,11 +74032,11 @@ index e1eee7aaa3b1..f23e850ec5b3 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..39ae2da973a6 100644
>---- third_party/libwebrtc/rtc_base/random_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/random_gn/moz.build
>+ 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..20e25b4b8f4b 100644
>+--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72558,7 +74058,7 @@ index a0f473e42d34..39ae2da973a6 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72577,10 +74077,6 @@ index a0f473e42d34..39ae2da973a6 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -72655,10 +74151,6 @@ index a0f473e42d34..39ae2da973a6 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -72721,11 +74213,11 @@ index a0f473e42d34..39ae2da973a6 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..f71d50ba8718 100644
>---- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72747,7 +74239,15 @@ index f3b81590de11..f71d50ba8718 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -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",
>++    "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc",
>+     "/third_party/libwebrtc/rtc_base/log_sinks.cc",
>+     "/third_party/libwebrtc/rtc_base/network_route.cc",
>+     "/third_party/libwebrtc/rtc_base/stream.cc"
>+@@ -47,191 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -72767,9 +74267,14 @@ index f3b81590de11..f71d50ba8718 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -72780,6 +74285,11 @@ index f3b81590de11..f71d50ba8718 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc",
>+-        "/third_party/libwebrtc/rtc_base/mac_ifaddrs_converter.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_AURA"] = "1"
>@@ -72796,9 +74306,14 @@ index f3b81590de11..f71d50ba8718 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -72813,6 +74328,10 @@ index f3b81590de11..f71d50ba8718 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -72921,11 +74440,11 @@ index f3b81590de11..f71d50ba8718 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..432cb13774bf 100644
>---- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -72947,7 +74466,7 @@ index fdb081242ba1..432cb13774bf 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -73035,10 +74554,6 @@ index fdb081242ba1..432cb13774bf 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -73114,11 +74629,11 @@ index fdb081242ba1..432cb13774bf 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..615068342e2c 100644
>---- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
>+ Library("rtc_event_gn")
>+diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73140,7 +74655,7 @@ index b793860d1fce..615068342e2c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,161 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -73228,10 +74743,6 @@ index b793860d1fce..615068342e2c 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -73307,11 +74818,11 @@ index b793860d1fce..615068342e2c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..20e25b4b8f4b 100644
>---- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73333,7 +74844,7 @@ index 765cb316c386..20e25b4b8f4b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -73352,6 +74863,10 @@ index 765cb316c386..20e25b4b8f4b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -73426,6 +74941,10 @@ index 765cb316c386..20e25b4b8f4b 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -73488,11 +75007,11 @@ index 765cb316c386..20e25b4b8f4b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("refcount_gn")
>-diff --git third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
>-index 5b5c4803e02f..2e37d9a011ce 100644
>---- third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rtc_base_gn/moz.build
>+ 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..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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73514,15 +75033,7 @@ index 5b5c4803e02f..2e37d9a011ce 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -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",
>-+    "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc",
>-     "/third_party/libwebrtc/rtc_base/log_sinks.cc",
>-     "/third_party/libwebrtc/rtc_base/network_route.cc",
>-     "/third_party/libwebrtc/rtc_base/stream.cc"
>-@@ -47,191 +58,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -73541,15 +75052,6 @@ index 5b5c4803e02f..2e37d9a011ce 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -73560,11 +75062,6 @@ index 5b5c4803e02f..2e37d9a011ce 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc",
>--        "/third_party/libwebrtc/rtc_base/mac_ifaddrs_converter.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["USE_AURA"] = "1"
>@@ -73580,15 +75077,6 @@ index 5b5c4803e02f..2e37d9a011ce 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -73603,10 +75091,6 @@ index 5b5c4803e02f..2e37d9a011ce 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/rtc_base/ifaddrs_converter.cc"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>@@ -73633,13 +75117,6 @@ index 5b5c4803e02f..2e37d9a011ce 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -73649,10 +75126,6 @@ index 5b5c4803e02f..2e37d9a011ce 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -73715,11 +75188,11 @@ index 5b5c4803e02f..2e37d9a011ce 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..6c60ddd28df2 100644
>---- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
>+ Library("safe_compare_gn")
>+diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73741,7 +75214,7 @@ index 8357ece6eb30..6c60ddd28df2 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -73838,10 +75311,6 @@ index 8357ece6eb30..6c60ddd28df2 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -73904,11 +75373,11 @@ index 8357ece6eb30..6c60ddd28df2 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..f2bdd05562f7 100644
>---- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
>+ Library("safe_conversions_gn")
>+diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
>+index 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,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -73930,7 +75399,7 @@ index 46355c5d0d6c..f2bdd05562f7 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,161 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -74027,10 +75496,6 @@ index 46355c5d0d6c..f2bdd05562f7 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -74093,11 +75558,11 @@ index 46355c5d0d6c..f2bdd05562f7 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..1d8bba37341e 100644
>---- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
>+ Library("safe_minmax_gn")
>+diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>+index da05f0b07f46..92d1c01b52ed 100644
>+--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74282,11 +75747,11 @@ index 333461b952e1..1d8bba37341e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- 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..8147a59fe325 100644
>---- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
>+ Library("sample_counter_gn")
>+diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>+index 2cd722b53276..bccf19feeb19 100644
>+--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74463,11 +75928,11 @@ index fd120e422965..8147a59fe325 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("safe_compare_gn")
>-diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
>-index aa5d30753476..23497bfe94f9 100644
>---- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
>+ Library("sanitizer_gn")
>+diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>+index 615800aaf567..e8fb17f6a5b9 100644
>+--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74489,7 +75954,7 @@ index aa5d30753476..23497bfe94f9 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -74509,6 +75974,7 @@ index aa5d30753476..23497bfe94f9 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -74577,6 +76043,13 @@ index aa5d30753476..23497bfe94f9 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -74586,6 +76059,10 @@ index aa5d30753476..23497bfe94f9 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -74648,11 +76125,11 @@ index aa5d30753476..23497bfe94f9 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("safe_conversions_gn")
>-diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
>-index fd5b77f258ab..27ad4b92689d 100644
>---- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
>+ Library("socket_address_gn")
>+diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>+index c8ec2004a876..5c8f28025406 100644
>+--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74674,7 +76151,7 @@ index fd5b77f258ab..27ad4b92689d 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,165 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -74694,6 +76171,7 @@ index fd5b77f258ab..27ad4b92689d 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -74762,6 +76240,13 @@ index fd5b77f258ab..27ad4b92689d 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -74833,11 +76318,11 @@ index fd5b77f258ab..27ad4b92689d 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("safe_minmax_gn")
>-diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>-index da05f0b07f46..92d1c01b52ed 100644
>---- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
>+ Library("socket_factory_gn")
>+diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
>+index a77aa3b56628..6e658e258670 100644
>+--- third_party/libwebrtc/rtc_base/socket_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -74859,7 +76344,7 @@ index da05f0b07f46..92d1c01b52ed 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -74879,6 +76364,7 @@ index da05f0b07f46..92d1c01b52ed 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -74947,6 +76433,13 @@ index da05f0b07f46..92d1c01b52ed 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -75022,11 +76515,11 @@ index da05f0b07f46..92d1c01b52ed 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("sample_counter_gn")
>-diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>-index 2cd722b53276..bccf19feeb19 100644
>---- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
>+ Library("socket_gn")
>+diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>+index 03c9f6c70a20..69625cc108ab 100644
>+--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75048,7 +76541,7 @@ index 2cd722b53276..bccf19feeb19 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,165 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75067,6 +76560,11 @@ index 2cd722b53276..bccf19feeb19 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -75132,6 +76630,13 @@ index 2cd722b53276..bccf19feeb19 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -75203,11 +76708,11 @@ index 2cd722b53276..bccf19feeb19 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("sanitizer_gn")
>-diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>-index 615800aaf567..e8fb17f6a5b9 100644
>---- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
>+ Library("socket_server_gn")
>+diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>+index a28a8193e323..1ba4ab392fc0 100644
>+--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75229,7 +76734,7 @@ index 615800aaf567..e8fb17f6a5b9 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,161 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75249,7 +76754,6 @@ index 615800aaf567..e8fb17f6a5b9 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -75318,13 +76822,6 @@ index 615800aaf567..e8fb17f6a5b9 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -75400,11 +76897,11 @@ index 615800aaf567..e8fb17f6a5b9 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("socket_address_gn")
>-diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>-index c8ec2004a876..5c8f28025406 100644
>---- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
>+ Library("stringutils_gn")
>+diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
>+index 9122864ca6c2..a3b46c212962 100644
>+--- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75426,7 +76923,7 @@ index c8ec2004a876..5c8f28025406 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,165 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75446,7 +76943,6 @@ index c8ec2004a876..5c8f28025406 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -75515,13 +77011,6 @@ index c8ec2004a876..5c8f28025406 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -75593,11 +77082,11 @@ index c8ec2004a876..5c8f28025406 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("socket_factory_gn")
>-diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
>-index a77aa3b56628..6e658e258670 100644
>---- third_party/libwebrtc/rtc_base/socket_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
>+ Library("swap_queue_gn")
>+diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
>+index 60b12d104404..243fe58a51a8 100644
>+--- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75619,7 +77108,7 @@ index a77aa3b56628..6e658e258670 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75639,7 +77128,6 @@ index a77aa3b56628..6e658e258670 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -75708,13 +77196,6 @@ index a77aa3b56628..6e658e258670 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -75724,10 +77205,6 @@ index a77aa3b56628..6e658e258670 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -75790,11 +77267,11 @@ index a77aa3b56628..6e658e258670 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("socket_gn")
>-diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>-index 03c9f6c70a20..69625cc108ab 100644
>---- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
>+ Library("mutex_gn")
>+diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
>+index e930dc4eb87f..8ccfb074dfaf 100644
>+--- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -75816,7 +77293,7 @@ index 03c9f6c70a20..69625cc108ab 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,165 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -75836,7 +77313,6 @@ index 03c9f6c70a20..69625cc108ab 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -75905,13 +77381,6 @@ index 03c9f6c70a20..69625cc108ab 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -75921,6 +77390,10 @@ index 03c9f6c70a20..69625cc108ab 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -75983,11 +77456,11 @@ index 03c9f6c70a20..69625cc108ab 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("socket_server_gn")
>-diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>-index a28a8193e323..1ba4ab392fc0 100644
>---- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
>+ Library("sequence_checker_internal_gn")
>+diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
>+index c1c194d69d18..331e816fc2e4 100644
>+--- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76009,7 +77482,7 @@ index a28a8193e323..1ba4ab392fc0 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,161 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76028,10 +77501,6 @@ index a28a8193e323..1ba4ab392fc0 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -76172,11 +77641,11 @@ index a28a8193e323..1ba4ab392fc0 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("stringutils_gn")
>-diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
>-index 9122864ca6c2..a3b46c212962 100644
>---- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
>+ Library("yield_gn")
>+diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
>+index 3f9531ff334a..32428dc7e390 100644
>+--- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76198,7 +77667,7 @@ index 9122864ca6c2..a3b46c212962 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76295,6 +77764,10 @@ index 9122864ca6c2..a3b46c212962 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -76357,11 +77830,11 @@ index 9122864ca6c2..a3b46c212962 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("swap_queue_gn")
>-diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
>-index 60b12d104404..243fe58a51a8 100644
>---- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
>+ Library("yield_policy_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
>+index 11ad1ecba2b2..19fddb84d994 100644
>+--- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76383,7 +77856,7 @@ index 60b12d104404..243fe58a51a8 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76402,10 +77875,6 @@ index 60b12d104404..243fe58a51a8 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -76542,11 +78011,96 @@ index 60b12d104404..243fe58a51a8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("mutex_gn")
>-diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
>-index e930dc4eb87f..8ccfb074dfaf 100644
>---- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
>+ Library("arch_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
>+deleted file mode 100644
>+index b9564ebb31f8..000000000000
>+--- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
>++++ /dev/null
>+@@ -1,79 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+-
>+-
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
>+-
>+-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"
>+-]
>+-
>+-if not CONFIG["MOZ_DEBUG"]:
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1":
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_X11"] = "1"
>+-
>+-Library("asm_defines_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/assume_gn/moz.build third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
>+index 890c29b07adb..ad43616a002b 100644
>+--- third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76568,7 +78122,7 @@ index e930dc4eb87f..8ccfb074dfaf 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76587,10 +78141,6 @@ index e930dc4eb87f..8ccfb074dfaf 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -76665,10 +78215,6 @@ index e930dc4eb87f..8ccfb074dfaf 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -76731,11 +78277,79 @@ index e930dc4eb87f..8ccfb074dfaf 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("sequence_checker_internal_gn")
>-diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
>-index c1c194d69d18..331e816fc2e4 100644
>---- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
>+ Library("assume_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
>+deleted file mode 100644
>+index 9885a84ac85a..000000000000
>+--- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
>++++ /dev/null
>+@@ -1,62 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+-
>+-
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
>+-
>+-CMMFLAGS += [
>+-    "-fobjc-arc"
>+-]
>+-
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
>+-
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["WEBRTC_ENABLE_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/third_party/abseil-cpp/",
>+-    "/tools/profiler/public"
>+-]
>+-
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/rtc_base/system/cocoa_threading.mm"
>+-]
>+-
>+-if not CONFIG["MOZ_DEBUG"]:
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1":
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-Library("cocoa_threading_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
>+index 7dcc5ecaeca6..b4c9c40e90d0 100644
>+--- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76757,7 +78371,7 @@ index c1c194d69d18..331e816fc2e4 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76776,6 +78390,10 @@ index c1c194d69d18..331e816fc2e4 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -76916,11 +78534,11 @@ index c1c194d69d18..331e816fc2e4 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("yield_gn")
>-diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
>-index 3f9531ff334a..32428dc7e390 100644
>---- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
>+ Library("file_wrapper_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
>+index 53f44fea711e..152615e8312b 100644
>+--- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -76942,7 +78560,7 @@ index 3f9531ff334a..32428dc7e390 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -76961,10 +78579,6 @@ index 3f9531ff334a..32428dc7e390 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -77039,10 +78653,6 @@ index 3f9531ff334a..32428dc7e390 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -77105,11 +78715,11 @@ index 3f9531ff334a..32428dc7e390 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("yield_policy_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
>-index 11ad1ecba2b2..19fddb84d994 100644
>---- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
>+ Library("ignore_warnings_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
>+index e8568c6f63ee..4f6d21fda069 100644
>+--- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77286,96 +78896,11 @@ index 11ad1ecba2b2..19fddb84d994 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("arch_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
>-deleted file mode 100644
>-index b9564ebb31f8..000000000000
>---- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
>-+++ /dev/null
>-@@ -1,79 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--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"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_X11"] = "1"
>--
>--Library("asm_defines_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/assume_gn/moz.build third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
>-index 890c29b07adb..ad43616a002b 100644
>---- third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/assume_gn/moz.build
>+ Library("inline_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
>+index f8920b35d245..ca1224c0f3ed 100644
>+--- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77552,79 +79077,11 @@ index 890c29b07adb..ad43616a002b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("assume_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
>-deleted file mode 100644
>-index 9885a84ac85a..000000000000
>---- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
>-+++ /dev/null
>-@@ -1,62 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--CMMFLAGS += [
>--    "-fobjc-arc"
>--]
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["WEBRTC_ENABLE_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/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>--
>--UNIFIED_SOURCES += [
>--    "/third_party/libwebrtc/rtc_base/system/cocoa_threading.mm"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["CPU_ARCH"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("cocoa_threading_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
>-index 7dcc5ecaeca6..b4c9c40e90d0 100644
>---- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
>+ Library("no_unique_address_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
>+index beb3a726f2a4..0516b3ad4df8 100644
>+--- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77646,7 +79103,7 @@ index 7dcc5ecaeca6..b4c9c40e90d0 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -77665,10 +79122,6 @@ index 7dcc5ecaeca6..b4c9c40e90d0 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -77743,10 +79196,6 @@ index 7dcc5ecaeca6..b4c9c40e90d0 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -77809,11 +79258,11 @@ index 7dcc5ecaeca6..b4c9c40e90d0 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("file_wrapper_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
>-index 53f44fea711e..152615e8312b 100644
>---- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
>+ Library("rtc_export_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
>+index 2de3ad5f5565..70942ab98bbe 100644
>+--- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -77990,11 +79439,11 @@ index 53f44fea711e..152615e8312b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("ignore_warnings_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
>-index e8568c6f63ee..4f6d21fda069 100644
>---- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
>+ Library("unused_gn")
>+diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
>+index 3a3b4a4b13cf..7594e86586e5 100644
>+--- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78171,11 +79620,11 @@ index e8568c6f63ee..4f6d21fda069 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("inline_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
>-index f8920b35d245..ca1224c0f3ed 100644
>---- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
>+ Library("warn_current_thread_is_deadlocked_gn")
>+diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
>+index 46a6acae4497..06150956fbb0 100644
>+--- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78197,7 +79646,7 @@ index f8920b35d245..ca1224c0f3ed 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -78216,187 +79665,10 @@ index f8920b35d245..ca1224c0f3ed 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>--
> -    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>+-        "log"
> -    ]
> -
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("no_unique_address_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
>-index beb3a726f2a4..0516b3ad4df8 100644
>---- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -78422,6 +79694,10 @@ index beb3a726f2a4..0516b3ad4df8 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -78462,6 +79738,13 @@ index beb3a726f2a4..0516b3ad4df8 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -78471,6 +79754,10 @@ index beb3a726f2a4..0516b3ad4df8 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -78533,11 +79820,11 @@ index beb3a726f2a4..0516b3ad4df8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("rtc_export_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
>-index 2de3ad5f5565..70942ab98bbe 100644
>---- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
>+ Library("repeating_task_gn")
>+diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
>+index c123810d56dc..a4bd3ae0e8d0 100644
>+--- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78559,7 +79846,7 @@ index 2de3ad5f5565..70942ab98bbe 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -78578,6 +79865,10 @@ index 2de3ad5f5565..70942ab98bbe 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -78652,6 +79943,10 @@ index 2de3ad5f5565..70942ab98bbe 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -78714,11 +80009,11 @@ index 2de3ad5f5565..70942ab98bbe 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("unused_gn")
>-diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
>-index 3a3b4a4b13cf..7594e86586e5 100644
>---- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
>+ Library("base64_gn")
>+diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
>+index 7d7f8864f3e8..f51bf20a585b 100644
>+--- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78740,7 +80035,7 @@ index 3a3b4a4b13cf..7594e86586e5 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -78833,6 +80128,10 @@ index 3a3b4a4b13cf..7594e86586e5 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -78895,11 +80194,11 @@ index 3a3b4a4b13cf..7594e86586e5 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("warn_current_thread_is_deadlocked_gn")
>-diff --git third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
>-index f330b9926bcf..90ba23ecca27 100644
>---- third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/task_utils/pending_task_safety_flag_gn/moz.build
>+ Library("sigslot_gn")
>+diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
>+index 56207997aec8..903dc4e0bb74 100644
>+--- third_party/libwebrtc/rtc_base/threading_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -78921,7 +80220,7 @@ index f330b9926bcf..90ba23ecca27 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -47,169 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -78941,6 +80240,7 @@ index f330b9926bcf..90ba23ecca27 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -79009,6 +80309,13 @@ index f330b9926bcf..90ba23ecca27 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -79084,11 +80391,11 @@ index f330b9926bcf..90ba23ecca27 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("pending_task_safety_flag_gn")
>-diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
>-index 46a6acae4497..06150956fbb0 100644
>---- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
>+ Library("threading_gn")
>+diff --git third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
>+index af464b00bdd8..4e0d38f5dbd5 100644
>+--- third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79110,7 +80417,7 @@ index 46a6acae4497..06150956fbb0 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79158,10 +80465,6 @@ index 46a6acae4497..06150956fbb0 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -79202,13 +80505,6 @@ index 46a6acae4497..06150956fbb0 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -79284,11 +80580,11 @@ index 46a6acae4497..06150956fbb0 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("repeating_task_gn")
>-diff --git third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
>-index 4133cceb8920..377053ce68a7 100644
>---- third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/task_utils/to_queued_task_gn/moz.build
>+ Library("timestamp_extrapolator_gn")
>+diff --git third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build
>+index be466ada874c..f6723437f53d 100644
>+--- third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79310,7 +80606,7 @@ index 4133cceb8920..377053ce68a7 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79398,6 +80694,10 @@ index 4133cceb8920..377053ce68a7 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -79407,6 +80707,10 @@ index 4133cceb8920..377053ce68a7 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -79469,12 +80773,12 @@ index 4133cceb8920..377053ce68a7 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("to_queued_task_gn")
>-diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
>-index c123810d56dc..a4bd3ae0e8d0 100644
>---- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ Library("timestamp_aligner_gn")
>+diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
>+index 782ed92c4944..dd49ac4f6a35 100644
>+--- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
>+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -79483,6 +80787,7 @@ index c123810d56dc..a4bd3ae0e8d0 100644
> +DEFINES["WEBRTC_BSD"] = True
> +DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -79495,7 +80800,7 @@ index c123810d56dc..a4bd3ae0e8d0 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -43,165 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79583,6 +80888,10 @@ index c123810d56dc..a4bd3ae0e8d0 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -79658,11 +80967,192 @@ index c123810d56dc..a4bd3ae0e8d0 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("base64_gn")
>-diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
>-index 7d7f8864f3e8..f51bf20a585b 100644
>---- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
>+ Library("timeutils_gn")
>+diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
>+index 18ffa6ea6955..e2ecd2648914 100644
>+--- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
>+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("type_traits_gn")
>+diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
>+index 16a72f40d74b..f0d8aac6e18f 100644
>+--- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79684,7 +81174,7 @@ index 7d7f8864f3e8..f51bf20a585b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79703,6 +81193,10 @@ index 7d7f8864f3e8..f51bf20a585b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -79777,10 +81271,6 @@ index 7d7f8864f3e8..f51bf20a585b 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -79843,11 +81333,11 @@ index 7d7f8864f3e8..f51bf20a585b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("sigslot_gn")
>-diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
>-index 56207997aec8..903dc4e0bb74 100644
>---- third_party/libwebrtc/rtc_base/threading_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
>+ Library("unit_base_gn")
>+diff --git third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
>+index b0f228c1463d..87020062c90b 100644
>+--- third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -79869,7 +81359,7 @@ index 56207997aec8..903dc4e0bb74 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -47,169 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -79888,11 +81378,6 @@ index 56207997aec8..903dc4e0bb74 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -79958,13 +81443,6 @@ index 56207997aec8..903dc4e0bb74 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -79974,10 +81452,6 @@ index 56207997aec8..903dc4e0bb74 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -80040,11 +81514,11 @@ index 56207997aec8..903dc4e0bb74 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("threading_gn")
>-diff --git third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
>-index af464b00bdd8..4e0d38f5dbd5 100644
>---- third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/time/timestamp_extrapolator_gn/moz.build
>+ Library("untyped_function_gn")
>+diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
>+index 11b148352fb2..bd171a928126 100644
>+--- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -80229,205 +81703,426 @@ index af464b00bdd8..4e0d38f5dbd5 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("timestamp_extrapolator_gn")
>-diff --git third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build
>-index be466ada874c..f6723437f53d 100644
>---- third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/timestamp_aligner_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+ Library("weak_ptr_gn")
>+diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
>+deleted file mode 100644
>+index 285700f44e15..000000000000
>+--- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
>++++ /dev/null
>+@@ -1,75 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
> -
>--if CONFIG["OS_TARGET"] == "Android":
> -
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
>+-
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
>+-
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-DEFINES["NOMINMAX"] = True
>+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-DEFINES["PSAPI_VERSION"] = "2"
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["UNICODE"] = True
>+-DEFINES["USE_AURA"] = "1"
>+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>+-DEFINES["WEBRTC_WIN"] = True
>+-DEFINES["WIN32"] = True
>+-DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-DEFINES["WINVER"] = "0x0A00"
>+-DEFINES["_ATL_NO_OPENGL"] = True
>+-DEFINES["_CRT_RAND_S"] = True
>+-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-DEFINES["_HAS_NODISCARD"] = True
>+-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_SECURE_ATL"] = True
>+-DEFINES["_UNICODE"] = True
>+-DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-DEFINES["_WINDOWS"] = True
>+-DEFINES["__STD_C"] = True
>+-
>+-FINAL_LIBRARY = "webrtc"
>+-
>+-
>+-LOCAL_INCLUDES += [
>+-    "!/ipc/ipdl/_ipdlheaders",
>+-    "/ipc/chromium/src",
>+-    "/third_party/libwebrtc/",
>+-    "/third_party/libwebrtc/third_party/abseil-cpp/",
>+-    "/tools/profiler/public"
>+-]
>+-
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/rtc_base/win/create_direct3d_device.cc"
>+-]
>+-
>+-if not CONFIG["MOZ_DEBUG"]:
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1":
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-Library("create_direct3d_device_gn")
>+diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
>+deleted file mode 100644
>+index e5469ac129ce..000000000000
>+--- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
>++++ /dev/null
>+@@ -1,75 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+-
>+-
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
>+-
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
>+-
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-DEFINES["NOMINMAX"] = True
>+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-DEFINES["PSAPI_VERSION"] = "2"
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["UNICODE"] = True
>+-DEFINES["USE_AURA"] = "1"
>+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>+-DEFINES["WEBRTC_WIN"] = True
>+-DEFINES["WIN32"] = True
>+-DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-DEFINES["WINVER"] = "0x0A00"
>+-DEFINES["_ATL_NO_OPENGL"] = True
>+-DEFINES["_CRT_RAND_S"] = True
>+-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-DEFINES["_HAS_NODISCARD"] = True
>+-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_SECURE_ATL"] = True
>+-DEFINES["_UNICODE"] = True
>+-DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-DEFINES["_WINDOWS"] = True
>+-DEFINES["__STD_C"] = True
>+-
>+-FINAL_LIBRARY = "webrtc"
>+-
>+-
>+-LOCAL_INCLUDES += [
>+-    "!/ipc/ipdl/_ipdlheaders",
>+-    "/ipc/chromium/src",
>+-    "/third_party/libwebrtc/",
>+-    "/third_party/libwebrtc/third_party/abseil-cpp/",
>+-    "/tools/profiler/public"
>+-]
>+-
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/rtc_base/win/get_activation_factory.cc"
>+-]
>+-
>+-if not CONFIG["MOZ_DEBUG"]:
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1":
>+-
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-Library("get_activation_factory_gn")
>+diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
>+deleted file mode 100644
>+index eb715b9756f7..000000000000
>+--- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
>++++ /dev/null
>+@@ -1,75 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+-
>+-
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
>+-
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
>+-
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-DEFINES["NOMINMAX"] = True
>+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-DEFINES["PSAPI_VERSION"] = "2"
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["UNICODE"] = True
>+-DEFINES["USE_AURA"] = "1"
>+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>+-DEFINES["WEBRTC_WIN"] = True
>+-DEFINES["WIN32"] = True
>+-DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-DEFINES["WINVER"] = "0x0A00"
>+-DEFINES["_ATL_NO_OPENGL"] = True
>+-DEFINES["_CRT_RAND_S"] = True
>+-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-DEFINES["_HAS_NODISCARD"] = True
>+-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_SECURE_ATL"] = True
>+-DEFINES["_UNICODE"] = True
>+-DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-DEFINES["_WINDOWS"] = True
>+-DEFINES["__STD_C"] = True
>+-
>+-FINAL_LIBRARY = "webrtc"
>+-
>+-
>+-LOCAL_INCLUDES += [
>+-    "!/ipc/ipdl/_ipdlheaders",
>+-    "/ipc/chromium/src",
>+-    "/third_party/libwebrtc/",
>+-    "/third_party/libwebrtc/third_party/abseil-cpp/",
>+-    "/tools/profiler/public"
>+-]
>+-
>+-SOURCES += [
>+-    "/third_party/libwebrtc/rtc_base/win/hstring.cc"
>+-]
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>+-if not CONFIG["MOZ_DEBUG"]:
> -
>--if CONFIG["OS_TARGET"] == "Darwin":
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-if CONFIG["MOZ_DEBUG"] == "1":
> -
>--if CONFIG["OS_TARGET"] == "Linux":
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-if CONFIG["CPU_ARCH"] == "aarch64":
> -
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-Library("hstring_gn")
>+diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
>+deleted file mode 100644
>+index 3c7eb72713d5..000000000000
>+--- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
>++++ /dev/null
>+@@ -1,75 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
> -
>--if CONFIG["OS_TARGET"] == "WINNT":
> -
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
> -
>--    OS_LIBS += [
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-DEFINES["NOMINMAX"] = True
>+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-DEFINES["PSAPI_VERSION"] = "2"
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["UNICODE"] = True
>+-DEFINES["USE_AURA"] = "1"
>+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>+-DEFINES["WEBRTC_WIN"] = True
>+-DEFINES["WIN32"] = True
>+-DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-DEFINES["WINVER"] = "0x0A00"
>+-DEFINES["_ATL_NO_OPENGL"] = True
>+-DEFINES["_CRT_RAND_S"] = True
>+-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-DEFINES["_HAS_NODISCARD"] = True
>+-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_SECURE_ATL"] = True
>+-DEFINES["_UNICODE"] = True
>+-DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-DEFINES["_WINDOWS"] = True
>+-DEFINES["__STD_C"] = True
> -
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>+-FINAL_LIBRARY = "webrtc"
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>--    DEFINES["_DEBUG"] = True
>+-LOCAL_INCLUDES += [
>+-    "!/ipc/ipdl/_ipdlheaders",
>+-    "/ipc/chromium/src",
>+-    "/third_party/libwebrtc/",
>+-    "/third_party/libwebrtc/third_party/abseil-cpp/",
>+-    "/tools/profiler/public"
>+-]
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/rtc_base/win/windows_version.cc"
>+-]
> -
>--    DEFINES["_DEBUG"] = True
>+-if not CONFIG["MOZ_DEBUG"]:
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
> -
>--    DEFINES["_DEBUG"] = True
>+-if CONFIG["MOZ_DEBUG"] == "1":
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
>--    DEFINES["_DEBUG"] = True
>+-if CONFIG["CPU_ARCH"] == "aarch64":
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-Library("windows_version_gn")
>+diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
>+deleted file mode 100644
>+index 356c932f58f2..000000000000
>+--- third_party/libwebrtc/rtc_base/win32_gn/moz.build
>++++ /dev/null
>+@@ -1,84 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
> -
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
> -
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>+-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-DEFINES["NOMINMAX"] = True
>+-DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-DEFINES["PSAPI_VERSION"] = "2"
>+-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+-DEFINES["RTC_ENABLE_VP9"] = True
>+-DEFINES["UNICODE"] = True
>+-DEFINES["USE_AURA"] = "1"
>+-DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>+-DEFINES["WEBRTC_WIN"] = True
>+-DEFINES["WIN32"] = True
>+-DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-DEFINES["WINVER"] = "0x0A00"
>+-DEFINES["_ATL_NO_OPENGL"] = True
>+-DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-DEFINES["_CRT_RAND_S"] = True
>+-DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-DEFINES["_HAS_NODISCARD"] = True
>+-DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-DEFINES["_SECURE_ATL"] = True
>+-DEFINES["_UNICODE"] = True
>+-DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-DEFINES["_WINDOWS"] = True
>+-DEFINES["__STD_C"] = True
> -
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-FINAL_LIBRARY = "webrtc"
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-LOCAL_INCLUDES += [
>+-    "!/ipc/ipdl/_ipdlheaders",
>+-    "/ipc/chromium/src",
>+-    "/third_party/libwebrtc/",
>+-    "/third_party/libwebrtc/third_party/abseil-cpp/",
>+-    "/tools/profiler/public"
>+-]
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-OS_LIBS += [
>+-    "crypt32",
>+-    "iphlpapi",
>+-    "secur32",
>+-    "winmm"
>+-]
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/rtc_base/win32.cc",
>+-    "/third_party/libwebrtc/rtc_base/win32_window.cc"
>+-]
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-if not CONFIG["MOZ_DEBUG"]:
> -
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-if CONFIG["MOZ_DEBUG"] == "1":
> -
>- Library("timestamp_aligner_gn")
>-diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
>-index 782ed92c4944..dd49ac4f6a35 100644
>---- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
>-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64":
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
>+-Library("win32_gn")
>+diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
>+index 1b5f0d9528a1..86eb1881eba8 100644
>+--- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
>++++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
>+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>  DEFINES["RTC_ENABLE_VP9"] = True
>@@ -80436,7 +82131,6 @@ index 782ed92c4944..dd49ac4f6a35 100644
> +DEFINES["WEBRTC_BSD"] = True
> +DEFINES["WEBRTC_ENABLE_AVX2"] = True
>  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True
>  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>  DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>@@ -80449,7 +82143,7 @@ index 782ed92c4944..dd49ac4f6a35 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -43,165 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -80537,10 +82231,6 @@ index 782ed92c4944..dd49ac4f6a35 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -80616,192 +82306,167 @@ index 782ed92c4944..dd49ac4f6a35 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("timeutils_gn")
>-diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
>-index 18ffa6ea6955..e2ecd2648914 100644
>---- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>+ Library("zero_memory_gn")
>+diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
>+deleted file mode 100644
>+index 95464447d39b..000000000000
>+--- third_party/libwebrtc/sdk/base_objc_gn/moz.build
>++++ /dev/null
>+@@ -1,74 +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/.
> -
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--if CONFIG["OS_TARGET"] == "Darwin":
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-CMFLAGS += [
>+-    "-fobjc-arc"
>+-]
> -
>--if CONFIG["OS_TARGET"] == "Linux":
>+-CMMFLAGS += [
>+-    "-fobjc-arc"
>+-]
> -
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-COMPILE_FLAGS["OS_INCLUDES"] = []
>+-AllowCompilerWarnings()
> -
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>+-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
> -
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-FINAL_LIBRARY = "webrtc"
> -
>--if CONFIG["OS_TARGET"] == "WINNT":
> -
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>+-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"
>+-]
> -
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/sdk/objc/base/RTCEncodedImage.m",
>+-    "/third_party/libwebrtc/sdk/objc/base/RTCLogging.mm",
>+-    "/third_party/libwebrtc/sdk/objc/base/RTCVideoCapturer.m",
>+-    "/third_party/libwebrtc/sdk/objc/base/RTCVideoCodecInfo.m",
>+-    "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderQpThresholds.m",
>+-    "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderSettings.m",
>+-    "/third_party/libwebrtc/sdk/objc/base/RTCVideoFrame.mm"
>+-]
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-if not CONFIG["MOZ_DEBUG"]:
> -
>--    DEFINES["_DEBUG"] = True
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-if CONFIG["MOZ_DEBUG"] == "1":
> -
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
> -    DEFINES["_DEBUG"] = True
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-if CONFIG["CPU_ARCH"] == "aarch64":
> -
>--    DEFINES["_DEBUG"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-Library("base_objc_gn")
>+diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
>+deleted file mode 100644
>+index 234fe71d1d25..000000000000
>+--- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
>++++ /dev/null
>+@@ -1,70 +0,0 @@
>+-# This Source Code Form is subject to the terms of the Mozilla Public
>+-# License, v. 2.0. If a copy of the MPL was not distributed with this
>+-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
> -
>--    DEFINES["_DEBUG"] = True
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>+-  ### DO NOT edit it by hand.                                       ###
> -
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-CMFLAGS += [
>+-    "-fobjc-arc"
>+-]
> -
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-CMMFLAGS += [
>+-    "-fobjc-arc"
>+-]
> -
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>+-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
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-FINAL_LIBRARY = "webrtc"
> -
>--    OS_LIBS += [
>--        "android_support"
>--    ]
> -
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-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"
>+-]
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-UNIFIED_SOURCES += [
>+-    "/third_party/libwebrtc/sdk/objc/helpers/AVCaptureSession+DevicePosition.mm",
>+-    "/third_party/libwebrtc/sdk/objc/helpers/NSString+StdString.mm",
>+-    "/third_party/libwebrtc/sdk/objc/helpers/RTCDispatcher.m"
>+-]
> -
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-if not CONFIG["MOZ_DEBUG"]:
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>+-    DEFINES["NDEBUG"] = True
>+-    DEFINES["NVALGRIND"] = True
> -
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-if CONFIG["MOZ_DEBUG"] == "1":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-    DEFINES["_DEBUG"] = True
> -
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-if CONFIG["CPU_ARCH"] == "aarch64":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM64"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
> -
>- Library("type_traits_gn")
>-diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
>-index 16a72f40d74b..f0d8aac6e18f 100644
>---- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
>+-Library("helpers_objc_gn")
>+diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
>+index ed0facb6bf83..2a2e962fbd6e 100644
>+--- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
>++++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -80823,7 +82488,7 @@ index 16a72f40d74b..f0d8aac6e18f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -80920,6 +82585,10 @@ index 16a72f40d74b..f0d8aac6e18f 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -80982,11 +82651,11 @@ index 16a72f40d74b..f0d8aac6e18f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("unit_base_gn")
>-diff --git third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
>-index b0f228c1463d..87020062c90b 100644
>---- third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/untyped_function_gn/moz.build
>+ Library("denormal_disabler_gn")
>+diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
>+index 6fe8360de36e..b8dcc03c5611 100644
>+--- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
>++++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81008,7 +82677,7 @@ index b0f228c1463d..87020062c90b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -81027,6 +82696,10 @@ index b0f228c1463d..87020062c90b 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -81092,6 +82765,10 @@ index b0f228c1463d..87020062c90b 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -81101,6 +82778,10 @@ index b0f228c1463d..87020062c90b 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -81163,11 +82844,11 @@ index b0f228c1463d..87020062c90b 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("untyped_function_gn")
>-diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
>-index 11b148352fb2..bd171a928126 100644
>---- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
>+ Library("field_trial_gn")
>+diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>+index b17503cb5956..d6cc8db5aee7 100644
>+--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>++++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81339,438 +83020,24 @@ index 11b148352fb2..bd171a928126 100644
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("weak_ptr_gn")
>-diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
>-deleted file mode 100644
>-index 285700f44e15..000000000000
>---- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
>-+++ /dev/null
>-@@ -1,75 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--DEFINES["NOMINMAX"] = True
>--DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--DEFINES["PSAPI_VERSION"] = "2"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["UNICODE"] = True
>--DEFINES["USE_AURA"] = "1"
>--DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>--DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>--DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>--DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>--DEFINES["WEBRTC_WIN"] = True
>--DEFINES["WIN32"] = True
>--DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--DEFINES["WINVER"] = "0x0A00"
>--DEFINES["_ATL_NO_OPENGL"] = True
>--DEFINES["_CRT_RAND_S"] = True
>--DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--DEFINES["_HAS_EXCEPTIONS"] = "0"
>--DEFINES["_HAS_NODISCARD"] = True
>--DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_SECURE_ATL"] = True
>--DEFINES["_UNICODE"] = True
>--DEFINES["_WIN32_WINNT"] = "0x0A00"
>--DEFINES["_WINDOWS"] = True
>--DEFINES["__STD_C"] = True
>--
>--FINAL_LIBRARY = "webrtc"
>--
>--
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>--
>--UNIFIED_SOURCES += [
>--    "/third_party/libwebrtc/rtc_base/win/create_direct3d_device.cc"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["CPU_ARCH"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("create_direct3d_device_gn")
>-diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
>-deleted file mode 100644
>-index e5469ac129ce..000000000000
>---- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
>-+++ /dev/null
>-@@ -1,75 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--DEFINES["NOMINMAX"] = True
>--DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--DEFINES["PSAPI_VERSION"] = "2"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["UNICODE"] = True
>--DEFINES["USE_AURA"] = "1"
>--DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>--DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>--DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>--DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>--DEFINES["WEBRTC_WIN"] = True
>--DEFINES["WIN32"] = True
>--DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--DEFINES["WINVER"] = "0x0A00"
>--DEFINES["_ATL_NO_OPENGL"] = True
>--DEFINES["_CRT_RAND_S"] = True
>--DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--DEFINES["_HAS_EXCEPTIONS"] = "0"
>--DEFINES["_HAS_NODISCARD"] = True
>--DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_SECURE_ATL"] = True
>--DEFINES["_UNICODE"] = True
>--DEFINES["_WIN32_WINNT"] = "0x0A00"
>--DEFINES["_WINDOWS"] = True
>--DEFINES["__STD_C"] = True
>--
>--FINAL_LIBRARY = "webrtc"
>--
>--
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>--
>--UNIFIED_SOURCES += [
>--    "/third_party/libwebrtc/rtc_base/win/get_activation_factory.cc"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["CPU_ARCH"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("get_activation_factory_gn")
>-diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
>-deleted file mode 100644
>-index eb715b9756f7..000000000000
>---- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
>-+++ /dev/null
>-@@ -1,75 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--DEFINES["NOMINMAX"] = True
>--DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--DEFINES["PSAPI_VERSION"] = "2"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["UNICODE"] = True
>--DEFINES["USE_AURA"] = "1"
>--DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>--DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>--DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>--DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>--DEFINES["WEBRTC_WIN"] = True
>--DEFINES["WIN32"] = True
>--DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--DEFINES["WINVER"] = "0x0A00"
>--DEFINES["_ATL_NO_OPENGL"] = True
>--DEFINES["_CRT_RAND_S"] = True
>--DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--DEFINES["_HAS_EXCEPTIONS"] = "0"
>--DEFINES["_HAS_NODISCARD"] = True
>--DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_SECURE_ATL"] = True
>--DEFINES["_UNICODE"] = True
>--DEFINES["_WIN32_WINNT"] = "0x0A00"
>--DEFINES["_WINDOWS"] = True
>--DEFINES["__STD_C"] = True
>--
>--FINAL_LIBRARY = "webrtc"
>--
>--
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>--
>--SOURCES += [
>--    "/third_party/libwebrtc/rtc_base/win/hstring.cc"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["CPU_ARCH"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("hstring_gn")
>-diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
>-deleted file mode 100644
>-index 3c7eb72713d5..000000000000
>---- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
>-+++ /dev/null
>-@@ -1,75 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--DEFINES["NOMINMAX"] = True
>--DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--DEFINES["PSAPI_VERSION"] = "2"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["UNICODE"] = True
>--DEFINES["USE_AURA"] = "1"
>--DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>--DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>--DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>--DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>--DEFINES["WEBRTC_WIN"] = True
>--DEFINES["WIN32"] = True
>--DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--DEFINES["WINVER"] = "0x0A00"
>--DEFINES["_ATL_NO_OPENGL"] = True
>--DEFINES["_CRT_RAND_S"] = True
>--DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--DEFINES["_HAS_EXCEPTIONS"] = "0"
>--DEFINES["_HAS_NODISCARD"] = True
>--DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_SECURE_ATL"] = True
>--DEFINES["_UNICODE"] = True
>--DEFINES["_WIN32_WINNT"] = "0x0A00"
>--DEFINES["_WINDOWS"] = True
>--DEFINES["__STD_C"] = True
>--
>--FINAL_LIBRARY = "webrtc"
>--
>--
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>--
>--UNIFIED_SOURCES += [
>--    "/third_party/libwebrtc/rtc_base/win/windows_version.cc"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["CPU_ARCH"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("windows_version_gn")
>-diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
>-deleted file mode 100644
>-index 356c932f58f2..000000000000
>---- third_party/libwebrtc/rtc_base/win32_gn/moz.build
>-+++ /dev/null
>-@@ -1,84 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--DEFINES["NOMINMAX"] = True
>--DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--DEFINES["PSAPI_VERSION"] = "2"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["UNICODE"] = True
>--DEFINES["USE_AURA"] = "1"
>--DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>--DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>--DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>--DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>--DEFINES["WEBRTC_WIN"] = True
>--DEFINES["WIN32"] = True
>--DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--DEFINES["WINVER"] = "0x0A00"
>--DEFINES["_ATL_NO_OPENGL"] = True
>--DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>--DEFINES["_CRT_RAND_S"] = True
>--DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--DEFINES["_HAS_EXCEPTIONS"] = "0"
>--DEFINES["_HAS_NODISCARD"] = True
>--DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--DEFINES["_SECURE_ATL"] = True
>--DEFINES["_UNICODE"] = True
>--DEFINES["_WIN32_WINNT"] = "0x0A00"
>--DEFINES["_WINDOWS"] = True
>--DEFINES["__STD_C"] = True
>--
>--FINAL_LIBRARY = "webrtc"
>--
>--
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>--
>--OS_LIBS += [
>--    "crypt32",
>--    "iphlpapi",
>--    "secur32",
>--    "winmm"
>--]
>--
>--UNIFIED_SOURCES += [
>--    "/third_party/libwebrtc/rtc_base/win32.cc",
>--    "/third_party/libwebrtc/rtc_base/win32_window.cc"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["MOZ_DEBUG"] == "1":
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "aarch64":
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--Library("win32_gn")
>-diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
>-index 1b5f0d9528a1..86eb1881eba8 100644
>---- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
>-+++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
>+ Library("metrics_gn")
>+diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>+index 46d6c227154e..2641fd638072 100644
>+--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>++++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -81792,7 +83059,7 @@ index 1b5f0d9528a1..86eb1881eba8 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -45,182 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -81811,6 +83078,12 @@ index 1b5f0d9528a1..86eb1881eba8 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    LOCAL_INCLUDES += [
>+-        "/config/external/nspr/",
>+-        "/nsprpub/lib/ds/",
>+-        "/nsprpub/pr/include/"
>+-    ]
>+-
> -    OS_LIBS += [
> -        "log"
> -    ]
>@@ -81840,6 +83113,14 @@ index 1b5f0d9528a1..86eb1881eba8 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
>+-    UNIFIED_SOURCES += [
>+-        "/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -81880,6 +83161,13 @@ index 1b5f0d9528a1..86eb1881eba8 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -81955,167 +83243,11 @@ index 1b5f0d9528a1..86eb1881eba8 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("zero_memory_gn")
>-diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
>-deleted file mode 100644
>-index 95464447d39b..000000000000
>---- third_party/libwebrtc/sdk/base_objc_gn/moz.build
>-+++ /dev/null
>-@@ -1,74 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--CMFLAGS += [
>--    "-fobjc-arc"
>--]
>--
>--CMMFLAGS += [
>--    "-fobjc-arc"
>--]
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["WEBRTC_ENABLE_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/sdk/objc/base/RTCEncodedImage.m",
>--    "/third_party/libwebrtc/sdk/objc/base/RTCLogging.mm",
>--    "/third_party/libwebrtc/sdk/objc/base/RTCVideoCapturer.m",
>--    "/third_party/libwebrtc/sdk/objc/base/RTCVideoCodecInfo.m",
>--    "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderQpThresholds.m",
>--    "/third_party/libwebrtc/sdk/objc/base/RTCVideoEncoderSettings.m",
>--    "/third_party/libwebrtc/sdk/objc/base/RTCVideoFrame.mm"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["CPU_ARCH"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("base_objc_gn")
>-diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
>-deleted file mode 100644
>-index 234fe71d1d25..000000000000
>---- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
>-+++ /dev/null
>-@@ -1,70 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>--
>--
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>--
>--CMFLAGS += [
>--    "-fobjc-arc"
>--]
>--
>--CMMFLAGS += [
>--    "-fobjc-arc"
>--]
>--
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>--
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>--DEFINES["RTC_ENABLE_VP9"] = True
>--DEFINES["WEBRTC_ENABLE_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/sdk/objc/helpers/AVCaptureSession+DevicePosition.mm",
>--    "/third_party/libwebrtc/sdk/objc/helpers/NSString+StdString.mm",
>--    "/third_party/libwebrtc/sdk/objc/helpers/RTCDispatcher.m"
>--]
>--
>--if not CONFIG["MOZ_DEBUG"]:
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1":
>--
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["CPU_ARCH"] == "aarch64":
>--
>--    DEFINES["WEBRTC_ARCH_ARM64"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--Library("helpers_objc_gn")
>-diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
>-index ed0facb6bf83..2a2e962fbd6e 100644
>---- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
>-+++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
>+ Library("system_wrappers_gn")
>+diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
>+index f5dd5dd860e5..c4184eeaf57b 100644
>+--- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
>++++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -82137,7 +83269,7 @@ index ed0facb6bf83..2a2e962fbd6e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82157,6 +83289,7 @@ index ed0facb6bf83..2a2e962fbd6e 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -82185,6 +83318,11 @@ index ed0facb6bf83..2a2e962fbd6e 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -82225,6 +83363,13 @@ index ed0facb6bf83..2a2e962fbd6e 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>+-
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -82234,10 +83379,6 @@ index ed0facb6bf83..2a2e962fbd6e 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -82300,33 +83441,24 @@ index ed0facb6bf83..2a2e962fbd6e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("denormal_disabler_gn")
>-diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
>-index 6fe8360de36e..b8dcc03c5611 100644
>---- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
>-+++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ Library("rtp_test_utils_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
>+index 9f6b45a412ad..40b0de7e0875 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
>+@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>+ 
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82336,28 +83468,12 @@ index 6fe8360de36e..b8dcc03c5611 100644
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "log"
>--    ]
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>@@ -82366,27 +83482,18 @@ index 6fe8360de36e..b8dcc03c5611 100644
> -    DEFINES["USE_NSS_CERTS"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
>@@ -82396,18 +83503,17 @@ index 6fe8360de36e..b8dcc03c5611 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
> -    DEFINES["WINVER"] = "0x0A00"
> -    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
>@@ -82415,25 +83521,139 @@ index 6fe8360de36e..b8dcc03c5611 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
> -    OS_LIBS += [
>--        "winmm"
>+-        "android_support",
>+-        "unwind"
> -    ]
>-+    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("algorithm_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
>+index 461ee70d7ebe..462dd153bed5 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
>+@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>  
>- if CONFIG["CPU_ARCH"] == "aarch64":
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>  
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>+ FINAL_LIBRARY = "webrtc"
>  
>--if CONFIG["CPU_ARCH"] == "arm":
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>+-if CONFIG["OS_TARGET"] == "Android":
> -
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -82445,8 +83665,8 @@ index 6fe8360de36e..b8dcc03c5611 100644
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["_DEBUG"] = True
>--
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -82475,51 +83695,38 @@ index 6fe8360de36e..b8dcc03c5611 100644
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("field_trial_gn")
>-diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>-index b17503cb5956..d6cc8db5aee7 100644
>---- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>-+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ Library("container_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
>+index b3e8809eff73..9284b6479ec7 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
>+@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>+ 
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82529,28 +83736,12 @@ index b17503cb5956..d6cc8db5aee7 100644
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "log"
>--    ]
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>@@ -82559,27 +83750,18 @@ index b17503cb5956..d6cc8db5aee7 100644
> -    DEFINES["USE_NSS_CERTS"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
>@@ -82589,40 +83771,23 @@ index b17503cb5956..d6cc8db5aee7 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
> -    DEFINES["WINVER"] = "0x0A00"
> -    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>@@ -82634,8 +83799,8 @@ index b17503cb5956..d6cc8db5aee7 100644
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["_DEBUG"] = True
>--
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -82664,51 +83829,38 @@ index b17503cb5956..d6cc8db5aee7 100644
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("metrics_gn")
>-diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>-index 46d6c227154e..2641fd638072 100644
>---- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>-+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ Library("atomic_hook_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
>+index 4233003ad577..914cb7710806 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
>+@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>+ 
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -45,182 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82718,34 +83870,12 @@ index 46d6c227154e..2641fd638072 100644
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    LOCAL_INCLUDES += [
>--        "/config/external/nspr/",
>--        "/nsprpub/lib/ds/",
>--        "/nsprpub/pr/include/"
>--    ]
>--
>--    OS_LIBS += [
>--        "log"
>--    ]
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>@@ -82754,35 +83884,18 @@ index 46d6c227154e..2641fd638072 100644
> -    DEFINES["USE_NSS_CERTS"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
>--    UNIFIED_SOURCES += [
>--        "/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc"
>--    ]
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
>@@ -82792,18 +83905,17 @@ index 46d6c227154e..2641fd638072 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
> -    DEFINES["WINVER"] = "0x0A00"
> -    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
>@@ -82811,29 +83923,6 @@ index 46d6c227154e..2641fd638072 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -82844,8 +83933,8 @@ index 46d6c227154e..2641fd638072 100644
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["_DEBUG"] = True
>--
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -82874,51 +83963,38 @@ index 46d6c227154e..2641fd638072 100644
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("system_wrappers_gn")
>-diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
>-index f5dd5dd860e5..c4184eeaf57b 100644
>---- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
>-+++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ Library("base_internal_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
>+index 58015ede9d26..5369db6348e3 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
>+@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>+ 
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -82928,29 +84004,12 @@ index f5dd5dd860e5..c4184eeaf57b 100644
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "GLESv2",
>--        "log"
>--    ]
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>@@ -82959,32 +84018,18 @@ index f5dd5dd860e5..c4184eeaf57b 100644
> -    DEFINES["USE_NSS_CERTS"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "dl",
>--        "rt"
>--    ]
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
>@@ -82994,18 +84039,17 @@ index f5dd5dd860e5..c4184eeaf57b 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
> -    DEFINES["WINVER"] = "0x0A00"
> -    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
>@@ -83013,25 +84057,6 @@ index f5dd5dd860e5..c4184eeaf57b 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -83042,8 +84067,8 @@ index f5dd5dd860e5..c4184eeaf57b 100644
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["_DEBUG"] = True
>--
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -83072,29 +84097,25 @@ index f5dd5dd860e5..c4184eeaf57b 100644
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("rtp_test_utils_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
>-index 9f6b45a412ad..40b0de7e0875 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
>+ Library("config_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
>+index 7d2c3d979f69..0672749e0277 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -83224,11 +84245,11 @@ index 9f6b45a412ad..40b0de7e0875 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("algorithm_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
>-index 461ee70d7ebe..462dd153bed5 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
>+ Library("core_headers_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
>+index f96ddd93bb4f..9879bb11b81a 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -83241,7 +84262,7 @@ index 461ee70d7ebe..462dd153bed5 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -83304,6 +84325,12 @@ index 461ee70d7ebe..462dd153bed5 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -83313,13 +84340,13 @@ index 461ee70d7ebe..462dd153bed5 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>-     DEFINES["_DEBUG"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
> -
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -83358,11 +84385,11 @@ index 461ee70d7ebe..462dd153bed5 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("container_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
>-index b3e8809eff73..9284b6479ec7 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
>+ Library("log_severity_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
>+index 5dc6a845d591..b78073c507d5 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -83375,7 +84402,7 @@ index b3e8809eff73..9284b6479ec7 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -83438,6 +84465,12 @@ index b3e8809eff73..9284b6479ec7 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -83447,13 +84480,13 @@ index b3e8809eff73..9284b6479ec7 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>-     DEFINES["_DEBUG"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
> -
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -83492,11 +84525,11 @@ index b3e8809eff73..9284b6479ec7 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("atomic_hook_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
>-index 4233003ad577..914cb7710806 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
>+ Library("raw_logging_internal_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
>+index a95db633b3fb..35ec1033253b 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -83509,7 +84542,7 @@ index 4233003ad577..914cb7710806 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -83572,6 +84605,12 @@ index 4233003ad577..914cb7710806 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -83581,13 +84620,13 @@ index 4233003ad577..914cb7710806 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>-     DEFINES["_DEBUG"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
> -
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -83626,11 +84665,11 @@ index 4233003ad577..914cb7710806 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("base_internal_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
>-index 58015ede9d26..5369db6348e3 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
>+ Library("throw_delegate_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
>+index 4e39dbb89676..061dd886d61b 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -83760,11 +84799,11 @@ index 58015ede9d26..5369db6348e3 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("config_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
>-index 7d2c3d979f69..0672749e0277 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
>+ Library("cleanup_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
>+index 4d655fcce792..7ff74145e47e 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -83894,11 +84933,11 @@ index 7d2c3d979f69..0672749e0277 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("core_headers_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
>-index f96ddd93bb4f..9879bb11b81a 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
>+ Library("cleanup_internal_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
>+index 7209713cb85a..689837b0c0d3 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -83911,7 +84950,7 @@ index f96ddd93bb4f..9879bb11b81a 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -83974,12 +85013,6 @@ index f96ddd93bb4f..9879bb11b81a 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -83989,13 +85022,13 @@ index f96ddd93bb4f..9879bb11b81a 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
>      DEFINES["_DEBUG"] = True
>  
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -84034,11 +85067,11 @@ index f96ddd93bb4f..9879bb11b81a 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("log_severity_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
>-index 5dc6a845d591..b78073c507d5 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
>+ Library("compressed_tuple_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
>+index 70b3e1cb35d4..237e183bc25d 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -84051,7 +85084,7 @@ index 5dc6a845d591..b78073c507d5 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -84114,12 +85147,6 @@ index 5dc6a845d591..b78073c507d5 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -84129,13 +85156,13 @@ index 5dc6a845d591..b78073c507d5 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
>      DEFINES["_DEBUG"] = True
>  
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -84174,129 +85201,145 @@ index 5dc6a845d591..b78073c507d5 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("raw_logging_internal_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
>-deleted file mode 100644
>-index 6413dbafcb95..000000000000
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
>-+++ /dev/null
>-@@ -1,53 +0,0 @@
>--# This Source Code Form is subject to the terms of the Mozilla Public
>--# License, v. 2.0. If a copy of the MPL was not distributed with this
>--# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+ Library("flat_hash_map_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
>+index 39fbab30d973..f5b45eb3b183 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
>+@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>+ 
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
> -
>+-if CONFIG["OS_TARGET"] == "Android":
> -
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>+-if CONFIG["OS_TARGET"] == "Darwin":
> -
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["ANDROID"] = True
>--DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--DEFINES["HAVE_SYS_UIO_H"] = True
>--DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
> -
>--FINAL_LIBRARY = "webrtc"
>+-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
> -
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
> -
>--if not CONFIG["MOZ_DEBUG"]:
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
> -
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>+-if CONFIG["OS_TARGET"] == "WINNT":
> -
>--if CONFIG["MOZ_DEBUG"] == "1":
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
> -
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_DEBUG"] = True
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>+-    DEFINES["_DEBUG"] = True
> -
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
> -
>--if CONFIG["CPU_ARCH"] == "x86":
>+-    DEFINES["_DEBUG"] = True
> -
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>--Library("cleanup_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
>-deleted file mode 100644
>-index ab9288e847f7..000000000000
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
>-+++ /dev/null
>-@@ -1,53 +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/.
>+     DEFINES["_DEBUG"] = True
>+ 
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
>+-    DEFINES["_DEBUG"] = True
> -
>--  ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
>--  ### DO NOT edit it by hand.                                       ###
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
>--COMPILE_FLAGS["OS_INCLUDES"] = []
>--AllowCompilerWarnings()
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
> -
>--DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>--DEFINES["ANDROID"] = True
>--DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--DEFINES["HAVE_SYS_UIO_H"] = True
>--DEFINES["_GNU_SOURCE"] = True
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
> -
>--FINAL_LIBRARY = "webrtc"
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
> -
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
> -
>--LOCAL_INCLUDES += [
>--    "!/ipc/ipdl/_ipdlheaders",
>--    "/ipc/chromium/src",
>--    "/third_party/libwebrtc/",
>--    "/third_party/libwebrtc/third_party/abseil-cpp/",
>--    "/tools/profiler/public"
>--]
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
> -
>--if not CONFIG["MOZ_DEBUG"]:
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
>--    DEFINES["NDEBUG"] = True
>--    DEFINES["NVALGRIND"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["MOZ_DEBUG"] == "1":
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--    DEFINES["_DEBUG"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--if CONFIG["CPU_ARCH"] == "x86":
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>+-    DEFINES["_GNU_SOURCE"] = True
> -
>--Library("cleanup_internal_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
>-index 7209713cb85a..689837b0c0d3 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
>+ Library("inlined_vector_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
>+index 6161d5ce01bf..99ad3eae9e46 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -84426,11 +85469,11 @@ index 7209713cb85a..689837b0c0d3 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("compressed_tuple_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
>-index 70b3e1cb35d4..237e183bc25d 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/flat_hash_map_gn/moz.build
>+ Library("inlined_vector_internal_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
>+index 067748c5ac6f..69a36f938696 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -84560,11 +85603,11 @@ index 70b3e1cb35d4..237e183bc25d 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("flat_hash_map_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
>-index 39fbab30d973..f5b45eb3b183 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
>+ Library("any_invocable_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
>+index 64977c41edec..b9f84bae9e9c 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -84694,11 +85737,11 @@ index 39fbab30d973..f5b45eb3b183 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("inlined_vector_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
>-index 6161d5ce01bf..99ad3eae9e46 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
>+ Library("bind_front_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
>+index b98bc24b90d1..ba4d02e31530 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -84828,11 +85871,11 @@ index 6161d5ce01bf..99ad3eae9e46 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("inlined_vector_internal_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
>-index 64977c41edec..b9f84bae9e9c 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
>+ Library("memory_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
>+index 639a1bf3ba8d..8ba0ade290ac 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -84962,11 +86005,11 @@ index 64977c41edec..b9f84bae9e9c 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("bind_front_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
>-index b98bc24b90d1..ba4d02e31530 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
>+ Library("type_traits_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
>+index 3d18e6187f5c..8e5d8abf8a36 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85096,11 +86139,11 @@ index b98bc24b90d1..ba4d02e31530 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("memory_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
>-index 639a1bf3ba8d..8ba0ade290ac 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
>+ Library("bits_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
>+index d927703f2116..5dafbbe1c776 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85113,7 +86156,7 @@ index 639a1bf3ba8d..8ba0ade290ac 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -85176,6 +86219,12 @@ index 639a1bf3ba8d..8ba0ade290ac 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -85185,13 +86234,13 @@ index 639a1bf3ba8d..8ba0ade290ac 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>-     DEFINES["_DEBUG"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
> -
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -85230,11 +86279,11 @@ index 639a1bf3ba8d..8ba0ade290ac 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("type_traits_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
>-index 3d18e6187f5c..8e5d8abf8a36 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
>+ Library("int128_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
>+index a62204b2113c..18ad2847682c 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85247,7 +86296,7 @@ index 3d18e6187f5c..8e5d8abf8a36 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,122 +42,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -85310,6 +86359,12 @@ index 3d18e6187f5c..8e5d8abf8a36 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -85319,9 +86374,149 @@ index 3d18e6187f5c..8e5d8abf8a36 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
>      DEFINES["_DEBUG"] = True
>  
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>+-
>+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>+ 
>+     DEFINES["USE_X11"] = "1"
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support",
>+-        "unwind"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    OS_LIBS += [
>+-        "android_support"
>+-    ]
>+-
>+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+ Library("internal_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
>+index d855b7beed02..031c9d92eb3b 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
>+@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ AllowCompilerWarnings()
>+ 
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>++DEFINES["USE_GLIB"] = "1"
>++DEFINES["USE_OZONE"] = "1"
>++DEFINES["_FILE_OFFSET_BITS"] = "64"
>++DEFINES["_LARGEFILE64_SOURCE"] = True
>++DEFINES["_LARGEFILE_SOURCE"] = True
>+ 
>+ FINAL_LIBRARY = "webrtc"
>+ 
>+@@ -50,122 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+ if CONFIG["MOZ_DEBUG"] == "1":
>+ 
>+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>+-
>+-if CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["ANDROID"] = True
>+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>+-    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["_GNU_SOURCE"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "Darwin":
>+-
>+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-
>+-if CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_NSS_CERTS"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_UDEV"] = True
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["USE_GLIB"] = "1"
>+-    DEFINES["USE_OZONE"] = "1"
>+-    DEFINES["USE_X11"] = "1"
>+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
>+-    DEFINES["_LARGEFILE64_SOURCE"] = True
>+-    DEFINES["_LARGEFILE_SOURCE"] = True
>+-
>+-if CONFIG["OS_TARGET"] == "WINNT":
>+-
>+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>+-    DEFINES["NOMINMAX"] = True
>+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>+-    DEFINES["PSAPI_VERSION"] = "2"
>+-    DEFINES["UNICODE"] = True
>+-    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WIN32"] = True
>+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>+-    DEFINES["WINVER"] = "0x0A00"
>+-    DEFINES["_ATL_NO_OPENGL"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>+-    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
>+-    DEFINES["_CRT_RAND_S"] = True
>+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_SECURE_ATL"] = True
>+-    DEFINES["_UNICODE"] = True
>+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
>+-    DEFINES["_WINDOWS"] = True
>+-    DEFINES["__STD_C"] = True
>+-
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -85364,11 +86559,11 @@ index 3d18e6187f5c..8e5d8abf8a36 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("bits_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
>-index d927703f2116..5dafbbe1c776 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
>+ Library("strings_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
>+index 146f86e25baa..5448e770c8ed 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85504,11 +86699,11 @@ index d927703f2116..5dafbbe1c776 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("int128_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
>-index a62204b2113c..18ad2847682c 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/internal_gn/moz.build
>+ Library("bad_optional_access_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
>+index 4af10489f537..3293ff093af5 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85521,7 +86716,7 @@ index a62204b2113c..18ad2847682c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -37,122 +42,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -85644,11 +86839,11 @@ index a62204b2113c..18ad2847682c 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("internal_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
>-index d855b7beed02..031c9d92eb3b 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
>+ Library("bad_variant_access_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
>+index 3b839cf457ba..9ab1def9fe7d 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85661,7 +86856,7 @@ index d855b7beed02..031c9d92eb3b 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -50,122 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -85724,24 +86919,18 @@ index d855b7beed02..031c9d92eb3b 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>-     DEFINES["_DEBUG"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
> -    DEFINES["_DEBUG"] = True
> -
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -85784,11 +86973,11 @@ index d855b7beed02..031c9d92eb3b 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("strings_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
>-index 146f86e25baa..5448e770c8ed 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
>+ Library("optional_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
>+index 31ab9bee8481..1953f12c2923 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85801,7 +86990,7 @@ index 146f86e25baa..5448e770c8ed 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -85864,12 +87053,6 @@ index 146f86e25baa..5448e770c8ed 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -85879,13 +87062,13 @@ index 146f86e25baa..5448e770c8ed 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
>      DEFINES["_DEBUG"] = True
>  
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -85924,11 +87107,11 @@ index 146f86e25baa..5448e770c8ed 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("bad_optional_access_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
>-index 4af10489f537..3293ff093af5 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
>+ Library("span_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
>+index 406ec1f6a9ac..bdbaa44d33cd 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -85941,7 +87124,7 @@ index 4af10489f537..3293ff093af5 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -35,122 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -86004,12 +87187,6 @@ index 4af10489f537..3293ff093af5 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -86019,13 +87196,13 @@ index 4af10489f537..3293ff093af5 100644
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
>      DEFINES["_DEBUG"] = True
>  
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>+-
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
> -
> -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>@@ -86064,11 +87241,11 @@ index 4af10489f537..3293ff093af5 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("bad_variant_access_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
>-index 3b839cf457ba..9ab1def9fe7d 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
>+ Library("variant_gn")
>+diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
>+index e4cc97e69fe0..fba5f187fc43 100644
>+--- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
>++++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
> @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>@@ -86198,24 +87375,27 @@ index 3b839cf457ba..9ab1def9fe7d 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("optional_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
>-index 31ab9bee8481..1953f12c2923 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
>-@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ Library("utility_gn")
>+diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
>+index be95ea0b6491..623ae45edde0 100644
>+--- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
>++++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
>+@@ -9,6 +9,14 @@
>+ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>- 
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>++
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+ 
>+@@ -32,133 +40,14 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -86226,11 +87406,15 @@ index 31ab9bee8481..1953f12c2923 100644
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>@@ -86242,6 +87426,8 @@ index 31ab9bee8481..1953f12c2923 100644
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
>@@ -86251,6 +87437,8 @@ index 31ab9bee8481..1953f12c2923 100644
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
>@@ -86265,19 +87453,29 @@ index 31ab9bee8481..1953f12c2923 100644
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
> -    DEFINES["WINVER"] = "0x0A00"
> -    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
>+-    DEFINES["_USE_MATH_DEFINES"] = True
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "ppc64":
>+ 
>+     DEFINES["PFFFT_SIMD_DISABLE"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -86288,8 +87486,8 @@ index 31ab9bee8481..1953f12c2923 100644
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>-     DEFINES["_DEBUG"] = True
>- 
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -86332,24 +87530,27 @@ index 31ab9bee8481..1953f12c2923 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("span_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
>-index 406ec1f6a9ac..bdbaa44d33cd 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
>-@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>+ Library("pffft_gn")
>+diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
>+index 37ea6a91a115..d711f7d67e9c 100644
>+--- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
>++++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
>+@@ -9,6 +9,14 @@
>+ COMPILE_FLAGS["OS_INCLUDES"] = []
>  AllowCompilerWarnings()
>  
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>- 
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>++
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+ 
>+@@ -32,128 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -86360,11 +87561,15 @@ index 406ec1f6a9ac..bdbaa44d33cd 100644
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>@@ -86376,6 +87581,8 @@ index 406ec1f6a9ac..bdbaa44d33cd 100644
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
>@@ -86385,6 +87592,8 @@ index 406ec1f6a9ac..bdbaa44d33cd 100644
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
>@@ -86399,12 +87608,10 @@ index 406ec1f6a9ac..bdbaa44d33cd 100644
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
> -    DEFINES["WINVER"] = "0x0A00"
> -    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
>@@ -86412,18 +87619,24 @@ index 406ec1f6a9ac..bdbaa44d33cd 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-if CONFIG["CPU_ARCH"] == "arm":
> -
>--    DEFINES["_DEBUG"] = True
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
> -
>+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>+-
>+     DEFINES["_DEBUG"] = True
>+ 
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["_DEBUG"] = True
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>-     DEFINES["_DEBUG"] = True
>- 
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -86466,24 +87679,33 @@ index 406ec1f6a9ac..bdbaa44d33cd 100644
> -
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("variant_gn")
>-diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
>-index e4cc97e69fe0..fba5f187fc43 100644
>---- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
>-+++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
>-@@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
>- AllowCompilerWarnings()
>- 
>+ Library("rnn_vad_gn")
>+diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
>+index a1f7c3beeb02..09c4d62a258e 100644
>+--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
>++++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
>+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
>++DEFINES["__STDC_CONSTANT_MACROS"] = True
>++DEFINES["__STDC_FORMAT_MACROS"] = True
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -31,116 +36,10 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -50,174 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -86493,12 +87715,29 @@ index e4cc97e69fe0..fba5f187fc43 100644
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "GLESv2",
>+-        "log"
>+-    ]
> -
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "Linux":
> -
>@@ -86507,18 +87746,32 @@ index e4cc97e69fe0..fba5f187fc43 100644
> -    DEFINES["USE_NSS_CERTS"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
>+-
>+-    OS_LIBS += [
>+-        "dl",
>+-        "rt"
>+-    ]
> -
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
>+-    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -if CONFIG["OS_TARGET"] == "WINNT":
> -
>@@ -86528,17 +87781,18 @@ index e4cc97e69fe0..fba5f187fc43 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
> -    DEFINES["WINVER"] = "0x0A00"
> -    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
>--    DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
>+-    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
>@@ -86546,6 +87800,29 @@ index e4cc97e69fe0..fba5f187fc43 100644
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>+-    OS_LIBS += [
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
>+-    ]
>++    DEFINES["_DEBUG"] = True
>+ 
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>+ 
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>+ 
>+-if CONFIG["CPU_ARCH"] == "arm":
>+-
>+-    CXXFLAGS += [
>+-        "-mfpu=neon"
>+-    ]
>+-
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -86556,8 +87833,8 @@ index e4cc97e69fe0..fba5f187fc43 100644
> -
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
> -
>-     DEFINES["_DEBUG"] = True
>- 
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -86586,41 +87863,51 @@ index e4cc97e69fe0..fba5f187fc43 100644
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("utility_gn")
>-diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
>-index be95ea0b6491..623ae45edde0 100644
>---- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
>-+++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
>-@@ -9,6 +9,14 @@
>- COMPILE_FLAGS["OS_INCLUDES"] = []
>- AllowCompilerWarnings()
>- 
>+ Library("video_adaptation_gn")
>+diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
>+index 413feef38cef..919a2f81dfc3 100644
>+--- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
>++++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
>+@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>+ DEFINES["RTC_ENABLE_VP9"] = True
> +DEFINES["USE_GLIB"] = "1"
> +DEFINES["USE_OZONE"] = "1"
>++DEFINES["WEBRTC_BSD"] = True
>++DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>++DEFINES["WEBRTC_POSIX"] = True
> +DEFINES["_FILE_OFFSET_BITS"] = "64"
> +DEFINES["_LARGEFILE64_SOURCE"] = True
> +DEFINES["_LARGEFILE_SOURCE"] = True
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>-+
>- FINAL_LIBRARY = "webrtc"
>  
>+ FINAL_LIBRARY = "webrtc"
>  
>-@@ -32,133 +40,14 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -86630,12 +87917,24 @@ index be95ea0b6491..623ae45edde0 100644
> -    DEFINES["ANDROID"] = True
> -    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
> -    DEFINES["HAVE_SYS_UIO_H"] = True
>+-    DEFINES["WEBRTC_ANDROID"] = True
>+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "log"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_MAC"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
> -    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
>@@ -86648,17 +87947,26 @@ index be95ea0b6491..623ae45edde0 100644
> -    DEFINES["USE_NSS_CERTS"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_UDEV"] = True
>+-    DEFINES["WEBRTC_LINUX"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>+-    OS_LIBS += [
>+-        "rt"
>+-    ]
>+-
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
> -    DEFINES["USE_OZONE"] = "1"
> -    DEFINES["USE_X11"] = "1"
>+-    DEFINES["WEBRTC_BSD"] = True
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_POSIX"] = True
> -    DEFINES["_FILE_OFFSET_BITS"] = "64"
> -    DEFINES["_LARGEFILE64_SOURCE"] = True
> -    DEFINES["_LARGEFILE_SOURCE"] = True
>@@ -86673,6 +87981,8 @@ index be95ea0b6491..623ae45edde0 100644
> -    DEFINES["PSAPI_VERSION"] = "2"
> -    DEFINES["UNICODE"] = True
> -    DEFINES["USE_AURA"] = "1"
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>+-    DEFINES["WEBRTC_WIN"] = True
> -    DEFINES["WIN32"] = True
> -    DEFINES["WIN32_LEAN_AND_MEAN"] = True
> -    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>@@ -86680,180 +87990,43 @@ index be95ea0b6491..623ae45edde0 100644
> -    DEFINES["_ATL_NO_OPENGL"] = True
> -    DEFINES["_CRT_RAND_S"] = True
> -    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
> -    DEFINES["_HAS_EXCEPTIONS"] = "0"
> -    DEFINES["_HAS_NODISCARD"] = True
> -    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
> -    DEFINES["_SECURE_ATL"] = True
> -    DEFINES["_UNICODE"] = True
>--    DEFINES["_USE_MATH_DEFINES"] = True
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
> -
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    CFLAGS += [
>--        "-mfpu=neon"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "ppc64":
>- 
>-     DEFINES["PFFFT_SIMD_DISABLE"] = True
>- 
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>--
> -    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>+-        "crypt32",
>+-        "iphlpapi",
>+-        "secur32",
>+-        "winmm"
> -    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("pffft_gn")
>-diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
>-index 37ea6a91a115..d711f7d67e9c 100644
>---- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
>-+++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
>-@@ -9,6 +9,14 @@
>- COMPILE_FLAGS["OS_INCLUDES"] = []
>- AllowCompilerWarnings()
>- 
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>-+
>- FINAL_LIBRARY = "webrtc"
>++    DEFINES["_DEBUG"] = True
>  
>+ if CONFIG["CPU_ARCH"] == "aarch64":
>  
>-@@ -32,128 +40,10 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>+     DEFINES["WEBRTC_ARCH_ARM64"] = True
>+     DEFINES["WEBRTC_HAS_NEON"] = True
>  
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>--
> -if CONFIG["CPU_ARCH"] == "arm":
> -
> -    CXXFLAGS += [
> -        "-mfpu=neon"
> -    ]
> -
>+-    DEFINES["WEBRTC_ARCH_ARM"] = True
>+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>+-    DEFINES["WEBRTC_HAS_NEON"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
> -
>-     DEFINES["_DEBUG"] = True
>- 
>+-    DEFINES["_DEBUG"] = True
>+-
> -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["_DEBUG"] = True
>@@ -86890,25 +88063,29 @@ index 37ea6a91a115..d711f7d67e9c 100644
> -
> -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
> -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
> -
>+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("rnn_vad_gn")
>-diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
>-index a1f7c3beeb02..09c4d62a258e 100644
>---- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
>-+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
>+ Library("decode_synchronizer_gn")
>+diff --git third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build
>+index d43415a0d44b..c19726355973 100644
>+--- third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build
>++++ third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -86930,7 +88107,7 @@ index a1f7c3beeb02..09c4d62a258e 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -50,174 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -87106,11 +88283,11 @@ index a1f7c3beeb02..09c4d62a258e 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("video_adaptation_gn")
>-diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
>-index 413feef38cef..919a2f81dfc3 100644
>---- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
>-+++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
>+ Library("frame_buffer_proxy_gn")
>+diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
>+index 1f9b0da3e765..afedfd58ecca 100644
>+--- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
>++++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -87306,11 +88483,11 @@ index 413feef38cef..919a2f81dfc3 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("decode_synchronizer_gn")
>-diff --git third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build
>-index d43415a0d44b..c19726355973 100644
>---- third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build
>-+++ third_party/libwebrtc/video/frame_buffer_proxy_gn/moz.build
>+ Library("frame_cadence_adapter_gn")
>+diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
>+index f5abae5c998e..b1350324b8c9 100644
>+--- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
>++++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -87332,7 +88509,7 @@ index d43415a0d44b..c19726355973 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -87352,7 +88529,6 @@ index d43415a0d44b..c19726355973 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -87382,7 +88558,6 @@ index d43415a0d44b..c19726355973 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "dl",
> -        "rt"
> -    ]
> -
>@@ -87442,10 +88617,6 @@ index d43415a0d44b..c19726355973 100644
>  
> -if CONFIG["CPU_ARCH"] == "arm":
> -
>--    CXXFLAGS += [
>--        "-mfpu=neon"
>--    ]
>--
> -    DEFINES["WEBRTC_ARCH_ARM"] = True
> -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
> -    DEFINES["WEBRTC_HAS_NEON"] = True
>@@ -87508,11 +88679,11 @@ index d43415a0d44b..c19726355973 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("frame_buffer_proxy_gn")
>-diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
>-index 1f9b0da3e765..afedfd58ecca 100644
>---- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
>-+++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
>+ Library("frame_decode_scheduler_gn")
>+diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
>+index 6d3c94548684..1324d9441a3f 100644
>+--- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
>++++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -87708,207 +88879,11 @@ index 1f9b0da3e765..afedfd58ecca 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("frame_cadence_adapter_gn")
>-diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
>-index f5abae5c998e..b1350324b8c9 100644
>---- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
>-+++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
>-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
>- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>- DEFINES["RTC_ENABLE_VP9"] = True
>-+DEFINES["USE_GLIB"] = "1"
>-+DEFINES["USE_OZONE"] = "1"
>-+DEFINES["WEBRTC_BSD"] = True
>-+DEFINES["WEBRTC_ENABLE_AVX2"] = True
>- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
>- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
>- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
>- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
>-+DEFINES["WEBRTC_POSIX"] = True
>-+DEFINES["_FILE_OFFSET_BITS"] = "64"
>-+DEFINES["_LARGEFILE64_SOURCE"] = True
>-+DEFINES["_LARGEFILE_SOURCE"] = True
>-+DEFINES["__STDC_CONSTANT_MACROS"] = True
>-+DEFINES["__STDC_FORMAT_MACROS"] = True
>- 
>- FINAL_LIBRARY = "webrtc"
>- 
>-@@ -37,168 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
>- if CONFIG["MOZ_DEBUG"] == "1":
>- 
>-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>--
>--if CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["ANDROID"] = True
>--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
>--    DEFINES["HAVE_SYS_UIO_H"] = True
>--    DEFINES["WEBRTC_ANDROID"] = True
>--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_MAC"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
>--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_NSS_CERTS"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_UDEV"] = True
>--    DEFINES["WEBRTC_LINUX"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
>--if CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["USE_GLIB"] = "1"
>--    DEFINES["USE_OZONE"] = "1"
>--    DEFINES["USE_X11"] = "1"
>--    DEFINES["WEBRTC_BSD"] = True
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_POSIX"] = True
>--    DEFINES["_FILE_OFFSET_BITS"] = "64"
>--    DEFINES["_LARGEFILE64_SOURCE"] = True
>--    DEFINES["_LARGEFILE_SOURCE"] = True
>--    DEFINES["__STDC_CONSTANT_MACROS"] = True
>--    DEFINES["__STDC_FORMAT_MACROS"] = True
>--
>--if CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
>--    DEFINES["NOMINMAX"] = True
>--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
>--    DEFINES["PSAPI_VERSION"] = "2"
>--    DEFINES["UNICODE"] = True
>--    DEFINES["USE_AURA"] = "1"
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["WEBRTC_WIN"] = True
>--    DEFINES["WIN32"] = True
>--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
>--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
>--    DEFINES["WINVER"] = "0x0A00"
>--    DEFINES["_ATL_NO_OPENGL"] = True
>--    DEFINES["_CRT_RAND_S"] = True
>--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
>--    DEFINES["_HAS_EXCEPTIONS"] = "0"
>--    DEFINES["_HAS_NODISCARD"] = True
>--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
>--    DEFINES["_SECURE_ATL"] = True
>--    DEFINES["_UNICODE"] = True
>--    DEFINES["_WIN32_WINNT"] = "0x0A00"
>--    DEFINES["_WINDOWS"] = True
>--    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
>-+    DEFINES["_DEBUG"] = True
>- 
>- if CONFIG["CPU_ARCH"] == "aarch64":
>- 
>-     DEFINES["WEBRTC_ARCH_ARM64"] = True
>-     DEFINES["WEBRTC_HAS_NEON"] = True
>- 
>--if CONFIG["CPU_ARCH"] == "arm":
>--
>--    DEFINES["WEBRTC_ARCH_ARM"] = True
>--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
>--    DEFINES["WEBRTC_HAS_NEON"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
>--
>--    DEFINES["_DEBUG"] = True
>--
>--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
>--
>--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
>--
>--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
>-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
>- 
>-     DEFINES["USE_X11"] = "1"
>- 
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support",
>--        "unwind"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
>--
>--    OS_LIBS += [
>--        "android_support"
>--    ]
>--
>--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
>--
>--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>--    DEFINES["_GNU_SOURCE"] = True
>--
>- Library("frame_decode_scheduler_gn")
>-diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
>-index 6d3c94548684..1324d9441a3f 100644
>---- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
>-+++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
>+ Library("frame_decode_timing_gn")
>+diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
>+index 6cd922640b5d..f0a182d3c53c 100644
>+--- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
>++++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -87930,7 +88905,7 @@ index 6d3c94548684..1324d9441a3f 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -87950,6 +88925,7 @@ index 6d3c94548684..1324d9441a3f 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -87979,6 +88955,7 @@ index 6d3c94548684..1324d9441a3f 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>+-        "dl",
> -        "rt"
> -    ]
> -
>@@ -88104,11 +89081,11 @@ index 6d3c94548684..1324d9441a3f 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("frame_decode_timing_gn")
>-diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
>-index 6cd922640b5d..f0a182d3c53c 100644
>---- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
>-+++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
>+ Library("frame_dumping_decoder_gn")
>+diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
>+index 11be038704fa..bea4589911ab 100644
>+--- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
>++++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -88130,7 +89107,7 @@ index 6cd922640b5d..f0a182d3c53c 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -88150,7 +89127,6 @@ index 6cd922640b5d..f0a182d3c53c 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "GLESv2",
> -        "log"
> -    ]
> -
>@@ -88180,7 +89156,6 @@ index 6cd922640b5d..f0a182d3c53c 100644
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
> -    OS_LIBS += [
>--        "dl",
> -        "rt"
> -    ]
> -
>@@ -88306,11 +89281,11 @@ index 6cd922640b5d..f0a182d3c53c 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("frame_dumping_decoder_gn")
>-diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
>-index 11be038704fa..bea4589911ab 100644
>---- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
>-+++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
>+ Library("task_queue_frame_decode_scheduler_gn")
>+diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
>+index e2984f7fb465..52fa4195adf5 100644
>+--- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
>++++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
> @@ -12,10 +12,20 @@ AllowCompilerWarnings()
>  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
>  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
>@@ -88332,7 +89307,7 @@ index 11be038704fa..bea4589911ab 100644
>  
>  FINAL_LIBRARY = "webrtc"
>  
>-@@ -41,172 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
>  if CONFIG["MOZ_DEBUG"] == "1":
>  
>      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
>@@ -88351,10 +89326,6 @@ index 11be038704fa..bea4589911ab 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "log"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "Darwin":
> -
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
>@@ -88380,10 +89351,6 @@ index 11be038704fa..bea4589911ab 100644
> -    DEFINES["__STDC_CONSTANT_MACROS"] = True
> -    DEFINES["__STDC_FORMAT_MACROS"] = True
> -
>--    OS_LIBS += [
>--        "rt"
>--    ]
>--
> -if CONFIG["OS_TARGET"] == "OpenBSD":
> -
> -    DEFINES["USE_GLIB"] = "1"
>@@ -88424,13 +89391,6 @@ index 11be038704fa..bea4589911ab 100644
> -    DEFINES["_WIN32_WINNT"] = "0x0A00"
> -    DEFINES["_WINDOWS"] = True
> -    DEFINES["__STD_C"] = True
>--
>--    OS_LIBS += [
>--        "crypt32",
>--        "iphlpapi",
>--        "secur32",
>--        "winmm"
>--    ]
> +    DEFINES["_DEBUG"] = True
>  
>  if CONFIG["CPU_ARCH"] == "aarch64":
>@@ -88506,7 +89466,7 @@ index 11be038704fa..bea4589911ab 100644
> -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
> -    DEFINES["_GNU_SOURCE"] = True
> -
>- Library("task_queue_frame_decode_scheduler_gn")
>+ Library("unique_timestamp_counter_gn")
> diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
> index bc06006cbea4..37fe8c168d75 100644
> --- third_party/libwebrtc/video/video_gn/moz.build
>diff --git a/www/librewolf/files/patch-toolkit_xre_glxtest.cpp b/www/librewolf/files/patch-toolkit_xre_glxtest.cpp
>new file mode 100644
>index 0000000..b89d8b4
>--- /dev/null
>+++ b/www/librewolf/files/patch-toolkit_xre_glxtest.cpp
>@@ -0,0 +1,17 @@
>+--- toolkit/xre/glxtest.cpp.orig
>++++ toolkit/xre/glxtest.cpp
>+@@ -270,9 +270,14 @@
>+ #define PCI_BASE_CLASS_DISPLAY 0x03
>+ 
>+ static void get_pci_status() {
>++#if defined(__FreeBSD__)
>++  if (access("/dev/pci", F_OK) != 0) {
>++    record_warning("cannot access /dev/pci");
>++#else
>+   if (access("/sys/bus/pci/", F_OK) != 0 &&
>+       access("/sys/bus/pci_express/", F_OK) != 0) {
>+     record_warning("cannot access /sys/bus/pci");
>++#endif
>+     return;
>+   }
>+

Actions: View | Diff

Attachments on bug 269092: 239634 | 239635 | 239636 | 239665 | 239666 | 239717 | 239726 | 239781 | 239895 | 239898 | 239904 | 239905 | 239929 | 240263